status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

consul: Only add ourself to the peerset if we are in bootstrap mode

This commit is contained in:
Armon Dadgar 2014-02-20 16:27:14 -08:00
parent 421c4d6933
commit 5d8783148b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
consul/server.go
View File

@ -220,7 +220,8 @@ func (s *Server) setupRaft() error {
// Setup the peer store // Setup the peer store
s.raftPeers = raft.NewJSONPeers(path, trans) s.raftPeers = raft.NewJSONPeers(path, trans)
// Ensure local host is always included // Ensure local host is always included if we are in bootstrap mode
if s.config.Bootstrap {
peers, err := s.raftPeers.Peers() peers, err := s.raftPeers.Peers()
if err != nil { if err != nil {
store.Close() store.Close()
@ -229,6 +230,7 @@ func (s *Server) setupRaft() error {
if !raft.PeerContained(peers, trans.LocalAddr()) { if !raft.PeerContained(peers, trans.LocalAddr()) {
s.raftPeers.SetPeers(raft.AddUniquePeer(peers, trans.LocalAddr())) s.raftPeers.SetPeers(raft.AddUniquePeer(peers, trans.LocalAddr()))
} }
}
// Make sure we set the LogOutput // Make sure we set the LogOutput
s.config.RaftConfig.LogOutput = s.config.LogOutput s.config.RaftConfig.LogOutput = s.config.LogOutput