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

Condense switch fallthroughs into expr lists

This commit is contained in:
Sam Boyer 2015-05-26 21:30:14 -04:00
parent e364bd4701
commit 40478cb534
4 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/agent/command.go
View File

@ -638,13 +638,7 @@ func (c *Command) Run(args []string) int {
c.Ui.Output(update.Op) c.Ui.Output(update.Op)
c.Ui.Info(fmt.Sprintf("%.2f%%", update.Progress)) c.Ui.Info(fmt.Sprintf("%.2f%%", update.Progress))
case update.Progress-lastProgress >= 5: case update.Progress-lastProgress >= 5, time.Now().Sub(lastFlush) > time.Second, update.Progress == 100:
fallthrough
case time.Now().Sub(lastFlush) > time.Second:
fallthrough
case update.Progress == 100:
lastFlush = time.Now() lastFlush = time.Now()
lastProgress = update.Progress lastProgress = update.Progress
c.Ui.Info(fmt.Sprintf("%.2f%%", update.Progress)) c.Ui.Info(fmt.Sprintf("%.2f%%", update.Progress))

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