Browse code

Update daemon to new swarmkit

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Tonis Tiigi authored on 2016/06/15 09:23:01
Showing 2 changed files
... ...
@@ -998,13 +998,13 @@ func (c *Cluster) managerStats() (current bool, reachable int, unreachable int,
998 998
 	}
999 999
 	for _, n := range nodes.Nodes {
1000 1000
 		if n.ManagerStatus != nil {
1001
-			if n.ManagerStatus.Raft.Status.Reachability == swarmapi.RaftMemberStatus_REACHABLE {
1001
+			if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_REACHABLE {
1002 1002
 				reachable++
1003 1003
 				if n.ID == c.node.NodeID() {
1004 1004
 					current = true
1005 1005
 				}
1006 1006
 			}
1007
-			if n.ManagerStatus.Raft.Status.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE {
1007
+			if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE {
1008 1008
 				unreachable++
1009 1009
 			}
1010 1010
 		}
... ...
@@ -56,9 +56,9 @@ func NodeFromGRPC(n swarmapi.Node) types.Node {
56 56
 	//Manager
57 57
 	if n.ManagerStatus != nil {
58 58
 		node.ManagerStatus = &types.ManagerStatus{
59
-			Leader:       n.ManagerStatus.Raft.Status.Leader,
60
-			Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Raft.Status.Reachability.String())),
61
-			Addr:         n.ManagerStatus.Raft.Addr,
59
+			Leader:       n.ManagerStatus.Leader,
60
+			Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Reachability.String())),
61
+			Addr:         n.ManagerStatus.Addr,
62 62
 		}
63 63
 	}
64 64