summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2017-09-05 07:58:30 -0700
committerGitHub <noreply@github.com>2017-09-05 07:58:30 -0700
commit7843dc3cfa7e99db5b6c89698ef09dbc7b6138ea (patch)
tree1cd6ffe921b38c273c247ec2b6f360862476f9ea
parent44e58bd1000d9663bca1d6f1ab580747c6629719 (diff)
downloadchat-7843dc3cfa7e99db5b6c89698ef09dbc7b6138ea.tar.gz
chat-7843dc3cfa7e99db5b6c89698ef09dbc7b6138ea.tar.bz2
chat-7843dc3cfa7e99db5b6c89698ef09dbc7b6138ea.zip
Fixing leader election (#7267)
-rw-r--r--app/admin.go2
-rw-r--r--einterfaces/cluster.go1
2 files changed, 2 insertions, 1 deletions
diff --git a/app/admin.go b/app/admin.go
index 6e6f8c604..609e37c96 100644
--- a/app/admin.go
+++ b/app/admin.go
@@ -28,7 +28,7 @@ func GetLogs(page, perPage int) ([]string, *model.AppError) {
if einterfaces.GetClusterInterface() != nil && *utils.Cfg.ClusterSettings.Enable {
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
- lines = append(lines, einterfaces.GetClusterInterface().GetClusterId())
+ lines = append(lines, einterfaces.GetClusterInterface().GetMyClusterInfo().Hostname)
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
}
diff --git a/einterfaces/cluster.go b/einterfaces/cluster.go
index 9d61b7503..6f42cae1a 100644
--- a/einterfaces/cluster.go
+++ b/einterfaces/cluster.go
@@ -15,6 +15,7 @@ type ClusterInterface interface {
RegisterClusterMessageHandler(event string, crm ClusterMessageHandler)
GetClusterId() string
IsLeader() bool
+ GetMyClusterInfo() *model.ClusterInfo
GetClusterInfos() []*model.ClusterInfo
SendClusterMessage(cluster *model.ClusterMessage)
NotifyMsg(buf []byte)