diff --git a/components/engine/api/client/node/accept.go b/components/engine/api/client/node/accept.go index ae672ffe90..d024cd8c64 100644 --- a/components/engine/api/client/node/accept.go +++ b/components/engine/api/client/node/accept.go @@ -33,7 +33,7 @@ func runAccept(dockerCli *client.DockerCli, flags *pflag.FlagSet, args []string) }); err != nil { return err } - fmt.Println(id, "attempting to accept a node in the swarm.") + fmt.Fprintf(dockerCli.Out(), "Node %s accepted in the swarm.", id) } return nil diff --git a/components/engine/api/client/node/demote.go b/components/engine/api/client/node/demote.go index 25f2073ee6..ed794afe10 100644 --- a/components/engine/api/client/node/demote.go +++ b/components/engine/api/client/node/demote.go @@ -33,7 +33,7 @@ func runDemote(dockerCli *client.DockerCli, flags *pflag.FlagSet, args []string) }); err != nil { return err } - fmt.Println(id, "attempting to demote a manager in the swarm.") + fmt.Fprintf(dockerCli.Out(), "Manager %s demoted in the swarm.", id) } return nil diff --git a/components/engine/api/client/node/promote.go b/components/engine/api/client/node/promote.go index 858b36a8c7..8c69521437 100644 --- a/components/engine/api/client/node/promote.go +++ b/components/engine/api/client/node/promote.go @@ -33,7 +33,7 @@ func runPromote(dockerCli *client.DockerCli, flags *pflag.FlagSet, args []string }); err != nil { return err } - fmt.Println(id, "attempting to promote a node to a manager in the swarm.") + fmt.Fprintf(dockerCli.Out(), "Node %s promoted to a manager in the swarm.", id) } return nil diff --git a/components/engine/api/client/node/update.go b/components/engine/api/client/node/update.go index 64cde8ea56..d18a4abdd0 100644 --- a/components/engine/api/client/node/update.go +++ b/components/engine/api/client/node/update.go @@ -21,7 +21,11 @@ func newUpdateCommand(dockerCli *client.DockerCli) *cobra.Command { Short: "Update a node", Args: cli.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { - return runUpdate(dockerCli, args[0], mergeNodeUpdate(flags)) + if err := runUpdate(dockerCli, args[0], mergeNodeUpdate(flags)); err != nil { + return err + } + fmt.Fprintln(dockerCli.Out(), args[0]) + return nil }, } @@ -47,7 +51,6 @@ func runUpdate(dockerCli *client.DockerCli, nodeID string, mergeNode func(node * return err } - fmt.Fprintf(dockerCli.Out(), "%s\n", nodeID) return nil }