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

Merge pull request #32186 from aaronlehmann/cluster-omitempty

Browse source 
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
This commit is contained in:
Vincent Demeester 2017-03-29 10:38:52 +02:00 • committed by GitHub
commit 4180211d80
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/types/swarm/swarm.go
View file

@ -179,10 +179,10 @@ type Info struct {
Error string Error string
RemoteManagers []Peer RemoteManagers []Peer
Nodes int Nodes int `json:",omitempty"`
Managers int Managers int `json:",omitempty"`
Cluster ClusterInfo Cluster *ClusterInfo `json:",omitempty"`
} }
// Peer represents a peer. // Peer represents a peer.

2
cli/command/system/info.go
View file

@ -97,7 +97,7 @@ func prettyPrintInfo(dockerCli *command.DockerCli, info types.Info) error {
fmt.Fprintf(dockerCli.Out(), " Error: %v\n", info.Swarm.Error) fmt.Fprintf(dockerCli.Out(), " Error: %v\n", info.Swarm.Error)
} }
fmt.Fprintf(dockerCli.Out(), " Is Manager: %v\n", info.Swarm.ControlAvailable) fmt.Fprintf(dockerCli.Out(), " Is Manager: %v\n", info.Swarm.ControlAvailable)
if info.Swarm.ControlAvailable && info.Swarm.Error == "" && info.Swarm.LocalNodeState != swarm.LocalNodeStateError { if info.Swarm.Cluster != nil && info.Swarm.ControlAvailable && info.Swarm.Error == "" && info.Swarm.LocalNodeState != swarm.LocalNodeStateError {
fmt.Fprintf(dockerCli.Out(), " ClusterID: %s\n", info.Swarm.Cluster.ID) fmt.Fprintf(dockerCli.Out(), " ClusterID: %s\n", info.Swarm.Cluster.ID)
fmt.Fprintf(dockerCli.Out(), " Managers: %d\n", info.Swarm.Managers) fmt.Fprintf(dockerCli.Out(), " Managers: %d\n", info.Swarm.Managers)
fmt.Fprintf(dockerCli.Out(), " Nodes: %d\n", info.Swarm.Nodes) fmt.Fprintf(dockerCli.Out(), " Nodes: %d\n", info.Swarm.Nodes)

3
daemon/cluster/swarm.go
View file

@ -407,8 +407,7 @@ func (c *Cluster) Info() types.Info {
info.Error = err.Error() info.Error = err.Error()
} }
// Strip JoinTokens info.Cluster = &swarm.ClusterInfo
info.Cluster = swarm.ClusterInfo
if r, err := state.controlClient.ListNodes(ctx, &swarmapi.ListNodesRequest{}); err != nil { if r, err := state.controlClient.ListNodes(ctx, &swarmapi.ListNodesRequest{}); err != nil {
info.Error = err.Error() info.Error = err.Error()