kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Update daemon to new swarmkit

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2016-06-14 17:23:01 -07:00
parent cdf279d74d
commit 25a89d73e5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/cluster/cluster.go
View file

@ -998,13 +998,13 @@ func (c *Cluster) managerStats() (current bool, reachable int, unreachable int,
} }
for _, n := range nodes.Nodes { for _, n := range nodes.Nodes {
if n.ManagerStatus != nil { if n.ManagerStatus != nil {
if n.ManagerStatus.Raft.Status.Reachability == swarmapi.RaftMemberStatus_REACHABLE { if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_REACHABLE {
reachable++ reachable++
if n.ID == c.node.NodeID() { if n.ID == c.node.NodeID() {
current = true current = true
} }
} }
if n.ManagerStatus.Raft.Status.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE { if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE {
unreachable++ unreachable++
} }
} }

6
daemon/cluster/convert/node.go
View file

@ -56,9 +56,9 @@ func NodeFromGRPC(n swarmapi.Node) types.Node {
//Manager //Manager
if n.ManagerStatus != nil { if n.ManagerStatus != nil {
node.ManagerStatus = &types.ManagerStatus{ node.ManagerStatus = &types.ManagerStatus{
Leader: n.ManagerStatus.Raft.Status.Leader, Leader: n.ManagerStatus.Leader,
Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Raft.Status.Reachability.String())), Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Reachability.String())),
Addr: n.ManagerStatus.Raft.Addr, Addr: n.ManagerStatus.Addr,
} }
} }