status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-09 12:25:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #977 from sdboyer/master

Browse Source 
nit: Condense switch fallthroughs into expression lists
This commit is contained in:
Ryan Breen 2015-05-26 21:45:01 -04:00
commit a02ba02815
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
consul/client.go
View File

@ -224,9 +224,7 @@ func (c *Client) lanEventHandler() {
switch e.EventType() { switch e.EventType() {
case serf.EventMemberJoin: case serf.EventMemberJoin:
c.nodeJoin(e.(serf.MemberEvent)) c.nodeJoin(e.(serf.MemberEvent))
case serf.EventMemberLeave: case serf.EventMemberLeave, serf.EventMemberFailed:
fallthrough
case serf.EventMemberFailed:
c.nodeFail(e.(serf.MemberEvent)) c.nodeFail(e.(serf.MemberEvent))
case serf.EventUser: case serf.EventUser:
c.localEvent(e.(serf.UserEvent)) c.localEvent(e.(serf.UserEvent))

4
consul/fsm.go
View File

@ -230,9 +230,7 @@ func (c *consulFSM) applyACLOperation(buf []byte, index uint64) interface{} {
} }
defer metrics.MeasureSince([]string{"consul", "fsm", "acl", string(req.Op)}, time.Now()) defer metrics.MeasureSince([]string{"consul", "fsm", "acl", string(req.Op)}, time.Now())
switch req.Op { switch req.Op {
case structs.ACLForceSet: case structs.ACLForceSet, structs.ACLSet:
fallthrough
case structs.ACLSet:
if err := c.state.ACLSet(index, &req.ACL); err != nil { if err := c.state.ACLSet(index, &req.ACL); err != nil {
return err return err
} else { } else {

8
consul/serf.go
View File

@ -41,9 +41,7 @@ func (s *Server) lanEventHandler() {
s.nodeJoin(e.(serf.MemberEvent), false) s.nodeJoin(e.(serf.MemberEvent), false)
s.localMemberEvent(e.(serf.MemberEvent)) s.localMemberEvent(e.(serf.MemberEvent))
case serf.EventMemberLeave: case serf.EventMemberLeave, serf.EventMemberFailed:
fallthrough
case serf.EventMemberFailed:
s.nodeFailed(e.(serf.MemberEvent), false) s.nodeFailed(e.(serf.MemberEvent), false)
s.localMemberEvent(e.(serf.MemberEvent)) s.localMemberEvent(e.(serf.MemberEvent))
@ -71,9 +69,7 @@ func (s *Server) wanEventHandler() {
switch e.EventType() { switch e.EventType() {
case serf.EventMemberJoin: case serf.EventMemberJoin:
s.nodeJoin(e.(serf.MemberEvent), true) s.nodeJoin(e.(serf.MemberEvent), true)
case serf.EventMemberLeave: case serf.EventMemberLeave, serf.EventMemberFailed:
fallthrough
case serf.EventMemberFailed:
s.nodeFailed(e.(serf.MemberEvent), true) s.nodeFailed(e.(serf.MemberEvent), true)
case serf.EventMemberUpdate: // Ignore case serf.EventMemberUpdate: // Ignore
case serf.EventMemberReap: // Ignore case serf.EventMemberReap: // Ignore