Skip to content

Commit 4ce521c

Browse files
cpuguy83thaJeztah
cpuguy83
authored and
thaJeztah
committed
info: print errors to stderr
Errors always need to go to stderr. This also fixes a test in moby/moby's integration-cli which is checking to see if errors connecting to the daemon are output on stderr. Signed-off-by: Brian Goff <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 5f07d7d commit 4ce521c

7 files changed

Lines changed: 16 additions & 14 deletions

‎cli/command/system/info.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func prettyPrintInfo(dockerCli command.Cli, info info) error {
136136
prettyPrintClientInfo(dockerCli, *info.ClientInfo)
137137
}
138138
for _, err := range info.ClientErrors {
139-
fmt.Fprintln(dockerCli.Out(), "ERROR:", err)
139+
fmt.Fprintln(dockerCli.Err(), "ERROR:", err)
140140
}
141141

142142
fmt.Fprintln(dockerCli.Out())
@@ -147,7 +147,7 @@ func prettyPrintInfo(dockerCli command.Cli, info info) error {
147147
}
148148
}
149149
for _, err := range info.ServerErrors {
150-
fmt.Fprintln(dockerCli.Out(), "ERROR:", err)
150+
fmt.Fprintln(dockerCli.Err(), "ERROR:", err)
151151
}
152152

153153
if len(info.ServerErrors) > 0 || len(info.ClientErrors) > 0 {

‎cli/command/system/info_test.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -340,20 +340,22 @@ func TestPrettyPrintInfo(t *testing.T) {
340340
ServerErrors: []string{"a server error occurred"},
341341
ClientErrors: []string{"a client error occurred"},
342342
},
343-
prettyGolden: "docker-info-errors",
344-
jsonGolden: "docker-info-errors",
345-
expectedError: "errors pretty printing info",
343+
prettyGolden: "docker-info-errors",
344+
jsonGolden: "docker-info-errors",
345+
warningsGolden: "docker-info-errors-stderr",
346+
expectedError: "errors pretty printing info",
346347
},
347348
{
348349
doc: "bad security info",
349350
dockerInfo: info{
350351
Info: &sampleInfoBadSecurity,
351-
ServerErrors: []string{"an error happened"},
352+
ServerErrors: []string{"a server error occurred"},
352353
ClientInfo: &clientInfo{Debug: false},
353354
},
354-
prettyGolden: "docker-info-badsec",
355-
jsonGolden: "docker-info-badsec",
356-
expectedError: "errors pretty printing info",
355+
prettyGolden: "docker-info-badsec",
356+
jsonGolden: "docker-info-badsec",
357+
warningsGolden: "docker-info-badsec-stderr",
358+
expectedError: "errors pretty printing info",
357359
},
358360
} {
359361
t.Run(tc.doc, func(t *testing.T) {

‎cli/command/system/testdata/docker-info-badsec-stderr.golden‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ERROR: a server error occurred
2+
ERROR: invalid empty security option

‎cli/command/system/testdata/docker-info-badsec.golden‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,3 @@ Server:
5151
Default Address Pools:
5252
Base: 10.123.0.0/16, Size: 24
5353

54-
ERROR: an error happened
55-
ERROR: invalid empty security option

‎cli/command/system/testdata/docker-info-badsec.json.golden‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"ID":"EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX","Containers":0,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":0,"Images":0,"Driver":"aufs","DriverStatus":[["Root Dir","/var/lib/docker/aufs"],["Backing Filesystem","extfs"],["Dirs","0"],["Dirperm1 Supported","true"]],"Plugins":{"Volume":["local"],"Network":["bridge","host","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"KernelMemoryTCP":false,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"PidsLimit":false,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":33,"OomKillDisable":true,"NGoroutines":135,"SystemTime":"2017-08-24T17:44:34.077811894Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":0,"KernelVersion":"4.4.0-87-generic","OperatingSystem":"Ubuntu 16.04.3 LTS","OSVersion":"","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":null,"AllowNondistributableArtifactsHostnames":null,"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":null,"Secure":true,"Official":true}},"Mirrors":null},"NCPU":2,"MemTotal":2097356800,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"","HttpsProxy":"","NoProxy":"","Name":"system-sample","Labels":["provider=digitalocean"],"ExperimentalBuild":false,"ServerVersion":"17.06.1-ce","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"6e23458c129b551d5c9871e5174f6b1b7f6d1170","Expected":"6e23458c129b551d5c9871e5174f6b1b7f6d1170"},"RuncCommit":{"ID":"810190ceaa507aa2727d7ae6f4790c76ec150bd2","Expected":"810190ceaa507aa2727d7ae6f4790c76ec150bd2"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["foo="],"DefaultAddressPools":[{"Base":"10.123.0.0/16","Size":24}],"Warnings":null,"ServerErrors":["an error happened"],"ClientInfo":{"Debug":false,"Context":"","Plugins":[],"Warnings":null}}
1+
{"ID":"EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX","Containers":0,"ContainersRunning":0,"ContainersPaused":0,"ContainersStopped":0,"Images":0,"Driver":"aufs","DriverStatus":[["Root Dir","/var/lib/docker/aufs"],["Backing Filesystem","extfs"],["Dirs","0"],["Dirperm1 Supported","true"]],"Plugins":{"Volume":["local"],"Network":["bridge","host","macvlan","null","overlay"],"Authorization":null,"Log":["awslogs","fluentd","gcplogs","gelf","journald","json-file","logentries","splunk","syslog"]},"MemoryLimit":true,"SwapLimit":true,"KernelMemory":true,"KernelMemoryTCP":false,"CpuCfsPeriod":true,"CpuCfsQuota":true,"CPUShares":true,"CPUSet":true,"PidsLimit":false,"IPv4Forwarding":true,"BridgeNfIptables":true,"BridgeNfIp6tables":true,"Debug":true,"NFd":33,"OomKillDisable":true,"NGoroutines":135,"SystemTime":"2017-08-24T17:44:34.077811894Z","LoggingDriver":"json-file","CgroupDriver":"cgroupfs","NEventsListener":0,"KernelVersion":"4.4.0-87-generic","OperatingSystem":"Ubuntu 16.04.3 LTS","OSVersion":"","OSType":"linux","Architecture":"x86_64","IndexServerAddress":"https://index.docker.io/v1/","RegistryConfig":{"AllowNondistributableArtifactsCIDRs":null,"AllowNondistributableArtifactsHostnames":null,"InsecureRegistryCIDRs":["127.0.0.0/8"],"IndexConfigs":{"docker.io":{"Name":"docker.io","Mirrors":null,"Secure":true,"Official":true}},"Mirrors":null},"NCPU":2,"MemTotal":2097356800,"GenericResources":null,"DockerRootDir":"/var/lib/docker","HttpProxy":"","HttpsProxy":"","NoProxy":"","Name":"system-sample","Labels":["provider=digitalocean"],"ExperimentalBuild":false,"ServerVersion":"17.06.1-ce","Runtimes":{"runc":{"path":"docker-runc"}},"DefaultRuntime":"runc","Swarm":{"NodeID":"","NodeAddr":"","LocalNodeState":"inactive","ControlAvailable":false,"Error":"","RemoteManagers":null},"LiveRestoreEnabled":false,"Isolation":"","InitBinary":"docker-init","ContainerdCommit":{"ID":"6e23458c129b551d5c9871e5174f6b1b7f6d1170","Expected":"6e23458c129b551d5c9871e5174f6b1b7f6d1170"},"RuncCommit":{"ID":"810190ceaa507aa2727d7ae6f4790c76ec150bd2","Expected":"810190ceaa507aa2727d7ae6f4790c76ec150bd2"},"InitCommit":{"ID":"949e6fa","Expected":"949e6fa"},"SecurityOptions":["foo="],"DefaultAddressPools":[{"Base":"10.123.0.0/16","Size":24}],"Warnings":null,"ServerErrors":["a server error occurred"],"ClientInfo":{"Debug":false,"Context":"","Plugins":[],"Warnings":null}}

‎cli/command/system/testdata/docker-info-errors-stderr.golden‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ERROR: a client error occurred
2+
ERROR: a server error occurred

‎cli/command/system/testdata/docker-info-errors.golden‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
Client:
2-
ERROR: a client error occurred
32

43
Server:
5-
ERROR: a server error occurred

0 commit comments

Comments
 (0)