diff options
author | Nalin Dahyabhai <nalin@redhat.com> | 2021-08-19 18:24:47 -0400 |
---|---|---|
committer | Nalin Dahyabhai <nalin@redhat.com> | 2021-08-23 18:00:18 -0400 |
commit | 21f396de6f5024abbf6edd2ca63edcb1525eefcc (patch) | |
tree | f1f030aeedb7af3a83f0d328485f76835b3a4217 /pkg/api/handlers | |
parent | b20a5470597897931699b976a9ed9ad1b2651c42 (diff) | |
download | podman-21f396de6f5024abbf6edd2ca63edcb1525eefcc.tar.gz podman-21f396de6f5024abbf6edd2ca63edcb1525eefcc.tar.bz2 podman-21f396de6f5024abbf6edd2ca63edcb1525eefcc.zip |
logs: adjust handling around partial log messages
In libpod/logs.LogLine.Write(), don't write a newline to stdout/stderr
when the log message is only part of a line.
In libpod.ConmonOCIRuntime.HTTPAttach(), don't send a newline over the
HTTP connection when the log message is only part of a line.
In pkg/api/handlers/compat.LogsFromContainer(), don't send a newline
over the HTTP connection when the log message is only part of a line,
and don't make doing so conditional on whether or not the client used
the docker or podman endpoint.
In pkg/domain/infra/tunnel.ContainerEngine.ContainerLogs(), don't add
our own newline to log messages, since they already come through from
the server when they need to.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r-- | pkg/api/handlers/compat/containers_logs.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkg/api/handlers/compat/containers_logs.go b/pkg/api/handlers/compat/containers_logs.go index 656e2c627..0c10ce75e 100644 --- a/pkg/api/handlers/compat/containers_logs.go +++ b/pkg/api/handlers/compat/containers_logs.go @@ -152,9 +152,7 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) { } frame.WriteString(line.Msg) - // Log lines in the compat layer require adding EOL - // https://github.com/containers/podman/issues/8058 - if !utils.IsLibpodRequest(r) { + if !line.Partial() { frame.WriteString("\n") } |