load join address from file

tdx · Aug 29, 2020 · 346505f · 346505f
1 parent 73e0c87
commit 346505f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/internal/discovery/membership.go b/internal/discovery/membership.go
@@ -53,10 +53,12 @@ func (m *Membership) setupSerf() (err error) {
 	}
 	m.logger = logger
 
-	if len(m.StartJoinAddrs) == 0 {
+	if len(m.StartJoinAddrs) < 2 {
 		if v := m.persist.GetJoins(); v != "" {
-
-			m.StartJoinAddrs = strings.Split(v, ",")
+			joinAddrs := strings.Split(v, ",")
+			if len(joinAddrs) > len(m.StartJoinAddrs) {
+				m.StartJoinAddrs = joinAddrs
+			}
 		}
 	}
 
@@ -191,7 +193,7 @@ func normaliseAddr(addr string) (string, error) {
 	switch host {
 	case "::":
 		host = "ip6-localhost"
-	case ":":
+	case "", ":":
 		host = "localhost"
 	}
 	return net.JoinHostPort(host, port), nil