Merge pull request #2105 from hashicorp/f-update-serf

Updates serf to get health score in stats.
This commit is contained in:
James Phillips 2016-06-08 17:20:50 -07:00
commit 9fe10723d6
2 changed files with 5 additions and 4 deletions

8
Godeps/Godeps.json generated
View File

@ -226,13 +226,13 @@
},
{
"ImportPath": "github.com/hashicorp/serf/coordinate",
"Comment": "v0.7.0-64-gdce30f1",
"Rev": "dce30f1c7806bf2d96478abb983c53af0e4c8fb2"
"Comment": "v0.7.0-66-g6c4672d",
"Rev": "6c4672d66fc6312ddde18399262943e21175d831"
},
{
"ImportPath": "github.com/hashicorp/serf/serf",
"Comment": "v0.7.0-64-gdce30f1",
"Rev": "dce30f1c7806bf2d96478abb983c53af0e4c8fb2"
"Comment": "v0.7.0-66-g6c4672d",
"Rev": "6c4672d66fc6312ddde18399262943e21175d831"
},
{
"ImportPath": "github.com/hashicorp/yamux",

View File

@ -1622,6 +1622,7 @@ func (s *Serf) Stats() map[string]string {
"members": toString(uint64(len(s.members))),
"failed": toString(uint64(len(s.failedMembers))),
"left": toString(uint64(len(s.leftMembers))),
"health_score": toString(uint64(s.memberlist.GetHealthScore())),
"member_time": toString(uint64(s.clock.Time())),
"event_time": toString(uint64(s.eventClock.Time())),
"query_time": toString(uint64(s.queryClock.Time())),