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

consul: Do not replay events on serf join

This commit is contained in:
Armon Dadgar 2014-02-20 16:27:03 -08:00
parent 4b6c1f92c0
commit 421c4d6933
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consul/client.go
View File

@ -153,7 +153,7 @@ func (c *Client) Leave() error {
// The target address should be another node inside the DC
// listening on the Serf LAN address
func (c *Client) JoinLAN(addrs []string) (int, error) {
return c.serf.Join(addrs, false)
return c.serf.Join(addrs, true)
}
// LANMembers is used to return the members of the LAN cluster

6
consul/server.go
View File

@ -381,7 +381,7 @@ func (s *Server) Leave() error {
ch := make(chan error, 1)
go func() {
var out struct{}
peer := s.rpcListener.Addr().String()
peer := s.raftTransport.LocalAddr().String()
err := s.connPool.RPC(leader, "Raft.RemovePeer", peer, &out)
ch <- err
}()
@ -404,14 +404,14 @@ AFTER_LEAVE:
// The target address should be another node inside the DC
// listening on the Serf LAN address
func (s *Server) JoinLAN(addrs []string) (int, error) {
return s.serfLAN.Join(addrs, false)
return s.serfLAN.Join(addrs, true)
}
// JoinWAN is used to have Consul join the cross-WAN Consul ring
// The target address should be another node listening on the
// Serf WAN address
func (s *Server) JoinWAN(addrs []string) (int, error) {
return s.serfWAN.Join(addrs, false)
return s.serfWAN.Join(addrs, true)
}
// LANMembers is used to return the members of the LAN cluster