From 7843dc3cfa7e99db5b6c89698ef09dbc7b6138ea Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Tue, 5 Sep 2017 07:58:30 -0700 Subject: Fixing leader election (#7267) --- app/admin.go | 2 +- einterfaces/cluster.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3-1-g7c22