luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #3123 from hashicorp/upgrade-warn 

Changes FSM catalog info messages into warnings.
This commit is contained in:
James Phillips 2017-06-07 20:47:06 -07:00 committed by GitHub
parent a634eb7b21 91d77c5c22
commit 0dd7aa570a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
consul/fsm.go
View File

@ -125,7 +125,7 @@ func (c *consulFSM) applyRegister(buf []byte, index uint64) interface{} {
// Apply all updates in a single transaction
if err := c.state.EnsureRegistration(index, &req); err != nil {
c.logger.Printf("[INFO] consul.fsm: EnsureRegistration failed: %v", err)
c.logger.Printf("[WARN] consul.fsm: EnsureRegistration failed: %v", err)
return err
}
return nil
@ -143,17 +143,17 @@ func (c *consulFSM) applyDeregister(buf []byte, index uint64) interface{} {
// make changes here, be sure to also adjust the code over there.
if req.ServiceID != "" {
if err := c.state.DeleteService(index, req.Node, req.ServiceID); err != nil {
c.logger.Printf("[INFO] consul.fsm: DeleteNodeService failed: %v", err)
c.logger.Printf("[WARN] consul.fsm: DeleteNodeService failed: %v", err)
return err
}
} else if req.CheckID != "" {
if err := c.state.DeleteCheck(index, req.Node, req.CheckID); err != nil {
c.logger.Printf("[INFO] consul.fsm: DeleteNodeCheck failed: %v", err)
c.logger.Printf("[WARN] consul.fsm: DeleteNodeCheck failed: %v", err)
return err
}
} else {
if err := c.state.DeleteNode(index, req.Node); err != nil {
c.logger.Printf("[INFO] consul.fsm: DeleteNode failed: %v", err)
c.logger.Printf("[WARN] consul.fsm: DeleteNode failed: %v", err)
return err
}
}