diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-11 10:38:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 10:38:17 -0500 |
| commit | b0a287ce46ee8326d25efc1e3b9d690eb1e1bbab (patch) | |
| tree | a08d6774ca2167f8c809c4488483f978a681c843 /pkg/domain/infra/abi | |
| parent | 99ac30a88287e2c174e69812293f6b130f7a67d5 (diff) | |
| parent | ba545c49a216d20be83bdfb0357a4d5f0abe6800 (diff) | |
| download | podman-b0a287ce46ee8326d25efc1e3b9d690eb1e1bbab.tar.gz podman-b0a287ce46ee8326d25efc1e3b9d690eb1e1bbab.tar.bz2 podman-b0a287ce46ee8326d25efc1e3b9d690eb1e1bbab.zip | |
Merge pull request #8686 from Luap99/logs-stderr
podman logs honor stderr correctly
Diffstat (limited to 'pkg/domain/infra/abi')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index ff4277a2e..ec65dbe44 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -925,7 +925,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta } func (ic *ContainerEngine) ContainerLogs(ctx context.Context, containers []string, options entities.ContainerLogsOptions) error { - if options.Writer == nil { + if options.StdoutWriter == nil && options.StderrWriter == nil { return errors.New("no io.Writer set for container logs") } @@ -963,7 +963,7 @@ func (ic *ContainerEngine) ContainerLogs(ctx context.Context, containers []strin }() for line := range logChannel { - fmt.Fprintln(options.Writer, line.String(logOpts)) + line.Write(options.StdoutWriter, options.StderrWriter, logOpts) } return nil |