diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-14 11:04:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 11:04:15 -0400 |
| commit | 5e54f72a9fd119168a29c0133cac2ed36d2014b5 (patch) | |
| tree | eb992bd5ac686abac4fc442c8b5640e72c1a8532 /pkg | |
| parent | cc9491447479844ffdd27ba1c310d7e0a5a59a79 (diff) | |
| parent | 31604b43d13c93bc730b07227ed0c39a7b3314cd (diff) | |
| download | podman-5e54f72a9fd119168a29c0133cac2ed36d2014b5.tar.gz podman-5e54f72a9fd119168a29c0133cac2ed36d2014b5.tar.bz2 podman-5e54f72a9fd119168a29c0133cac2ed36d2014b5.zip | |
Merge pull request #11562 from Luap99/revert-log
[v3.4] Revert "logs: adjust handling around partial log messages"
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/compat/containers_logs.go | 4 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go index 4adcaa511..d73b02b47 100644 --- a/pkg/api/handlers/compat/containers_logs.go +++ b/pkg/api/handlers/compat/containers_logs.go @@ -153,7 +153,9 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) { } frame.WriteString(line.Msg) - if !line.Partial() { + // Log lines in the compat layer require adding EOL + // https://github.com/containers/podman/issues/8058 + if !utils.IsLibpodRequest(r) { frame.WriteString("\n") } diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 81ddce42f..b638bfe24 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -404,11 +404,11 @@ func (ic *ContainerEngine) ContainerLogs(_ context.Context, nameOrIDs []string, return err case line := <-stdoutCh: if opts.StdoutWriter != nil { - _, _ = io.WriteString(opts.StdoutWriter, line) + _, _ = io.WriteString(opts.StdoutWriter, line+"\n") } case line := <-stderrCh: if opts.StderrWriter != nil { - _, _ = io.WriteString(opts.StderrWriter, line) + _, _ = io.WriteString(opts.StderrWriter, line+"\n") } } } |