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

Gets rid of error prefixing in leader.go.

This commit is contained in:
James Phillips 2015-10-20 13:37:11 -07:00
parent f3a95bf9fe
commit 785bf6678d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
consul/leader.go
View File

@ -377,7 +377,7 @@ func (s *Server) handleAliveMember(member serf.Member) error {
state := s.fsm.State()
_, node, err := state.GetNode(member.Name)
if err != nil {
return fmt.Errorf("failed to lookup node %s: %s", member.Name, err)
return err
}
if node != nil && node.Address == member.Addr.String() {
// Check if the associated service is available
@ -439,7 +439,7 @@ func (s *Server) handleFailedMember(member serf.Member) error {
state := s.fsm.State()
_, node, err := state.GetNode(member.Name)
if err != nil {
return fmt.Errorf("failed to lookup node %s: %s", member.Name, err)
return err
}
if node != nil && node.Address == member.Addr.String() {
// Check if the serfCheck is in the critical state
@ -506,7 +506,7 @@ func (s *Server) handleDeregisterMember(reason string, member serf.Member) error
state := s.fsm.State()
_, node, err := state.GetNode(member.Name)
if err != nil {
return fmt.Errorf("failed to lookup node %s: %s", member.Name, err)
return err
}
if node == nil {
return nil