check errs on serf bootstrap

travisjeffery · Jan 24, 2017 · 5a63de5 · 5a63de5
1 parent e4d0269
commit 5a63de5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/broker/broker.go b/broker/broker.go
@@ -96,8 +96,11 @@ func New(id int32, opts ...BrokerFn) (*Broker, error) {
 		return nil, err
 	}
 
+	// bootstrap serf members.
 	if len(b.serfMembers) != 0 {
-		b.serf.Join(b.serfMembers, false)
+		if _, err := b.serf.Join(b.serfMembers, true); err != nil {
+			return nil, err
+		}
 	}
 
 	if err = b.setupRaft(); err != nil {

diff --git a/broker/serf.go b/broker/serf.go
@@ -36,7 +36,9 @@ func (b *Broker) setupSerf(conf *serf.Config, eventCh chan serf.Event, serfSnaps
 			addr := &net.TCPAddr{IP: net.ParseIP(p.IP), Port: p.SerfPort}
 			addrs = append(addrs, addr.String())
 		}
-		s.Join(addrs, true)
+		if _, err := s.Join(addrs, true); err != nil {
+			return nil, err
+		}
 	}
 	return s, nil
 }