InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/command: NewDaemonRunner: set both stdout and stderr

Browse Source 
Make sure Cobra is configured with the streams we use, and use
Cobra's utilities to print the validation messsage.

While updating, also add a short comment outlining why we're using
STDERR, not STDOUT for this message.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-11-06 00:58:49 +01:00
parent 0678de9c87
commit 4a3e139e3c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/command/docker.go
View File

@@ -15,7 +15,7 @@ import (
var honorXDG bool
func newDaemonCommand(stderr io.Writer) (*cobra.Command, error) {
func newDaemonCommand() (*cobra.Command, error) {
// FIXME(thaJeztah): config.New also looks up default binary-path, but this code is also executed when running "--version".
cfg, err := config.New()
if err != nil {
@@ -38,7 +38,10 @@ func newDaemonCommand(stderr io.Writer) (*cobra.Command, error) {
}
if opts.Validate {
// If config wasn't OK we wouldn't have made it this far.
_, _ = fmt.Fprintln(stderr, "configuration OK")
//
// We print this message on STDERR, not STDOUT, to align
// with other tools, such as "nginx -t" or "sshd -t".
cmd.PrintErrln("configuration OK")
return nil
}
@@ -104,11 +107,12 @@ func NewDaemonRunner(stdout, stderr io.Writer) (Runner, error) {
initLogging(stdout, stderr)
cmd, err := newDaemonCommand(stderr)
cmd, err := newDaemonCommand()
if err != nil {
return nil, err
}
cmd.SetOut(stdout)
cmd.SetErr(stderr)
return daemonRunner{cmd}, nil
}