summaryrefslogtreecommitdiffstats
path: root/app/cluster_discovery.go
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-24 08:40:52 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-24 08:40:52 -0400
commit69304fb54da5300941a49364e4344c2c65e654d6 (patch)
treede20c2e8a479ae3d13bcd21abc3dff067afa602e /app/cluster_discovery.go
parente46b94fa66c029b9a493fdc6ff7bcb98e9651568 (diff)
parent47f3c064db885c2cb2e75c195ea24e2ef687891d (diff)
downloadchat-69304fb54da5300941a49364e4344c2c65e654d6.tar.gz
chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.bz2
chat-69304fb54da5300941a49364e4344c2c65e654d6.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/cluster_discovery.go')
-rw-r--r--app/cluster_discovery.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/cluster_discovery.go b/app/cluster_discovery.go
index f7443680c..250744279 100644
--- a/app/cluster_discovery.go
+++ b/app/cluster_discovery.go
@@ -85,3 +85,11 @@ func (a *App) IsLeader() bool {
return true
}
}
+
+func (a *App) GetClusterId() string {
+ if a.Cluster == nil {
+ return ""
+ }
+
+ return a.Cluster.GetClusterId()
+}