Merge pull request #1097 from grafana/fix-cluster-advertise

Fix advertise address bug in cluster config
grafana · Oct 15, 2018 · 63e4a7e · 63e4a7e
2 parents 0cb838a + 7a85a76
commit 63e4a7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cluster/config.go b/cluster/config.go
@@ -124,10 +124,8 @@ func ConfigProcess() {
 		if swimAdvertiseAddrStr != "" {
 			swimAdvertiseAddr, err = net.ResolveTCPAddr("tcp", swimAdvertiseAddrStr)
 			if err != nil {
-				log.Fatal(4, "CLU Config: swim-advertise-addr is not a valid TCP address: %s", err.Error())
+				log.Fatalf("CLU Config: swim-advertise-addr is not a valid TCP address: %s", err.Error())
 			}
-		} else {
-			swimAdvertiseAddr = swimBindAddr
 		}
 	}
 }
diff --git a/cluster/manager.go b/cluster/manager.go
@@ -83,8 +83,12 @@ func NewMemberlistManager(thisNode HTTPNode) *MemberlistManager {
 		mgr.cfg = memberlist.DefaultLANConfig() // use this as base so that the other settings have proper defaults
 		mgr.cfg.BindPort = swimBindAddr.Port
 		mgr.cfg.BindAddr = swimBindAddr.IP.String()
-		mgr.cfg.AdvertisePort = swimAdvertiseAddr.Port
-		mgr.cfg.AdvertiseAddr = swimAdvertiseAddr.IP.String()
+		if swimAdvertiseAddr == nil {
+			mgr.cfg.AdvertisePort = swimBindAddr.Port
+		} else {
+			mgr.cfg.AdvertisePort = swimAdvertiseAddr.Port
+			mgr.cfg.AdvertiseAddr = swimAdvertiseAddr.IP.String()
+		}
 		mgr.cfg.TCPTimeout = swimTCPTimeout
 		mgr.cfg.IndirectChecks = swimIndirectChecks
 		mgr.cfg.RetransmitMult = swimRetransmitMult