summaryrefslogtreecommitdiff
path: root/libpod/logs
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@redhat.com>2021-08-19 18:24:47 -0400
committerNalin Dahyabhai <nalin@redhat.com>2021-08-23 18:00:18 -0400
commit21f396de6f5024abbf6edd2ca63edcb1525eefcc (patch)
treef1f030aeedb7af3a83f0d328485f76835b3a4217 /libpod/logs
parentb20a5470597897931699b976a9ed9ad1b2651c42 (diff)
downloadpodman-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 'libpod/logs')
-rw-r--r--libpod/logs/log.go12
1 files changed, 10 insertions, 2 deletions
diff --git a/libpod/logs/log.go b/libpod/logs/log.go
index 1a0223edc..a584de0ee 100644
--- a/libpod/logs/log.go
+++ b/libpod/logs/log.go
@@ -251,11 +251,19 @@ func (l *LogLine) Write(stdout io.Writer, stderr io.Writer, logOpts *LogOptions)
switch l.Device {
case "stdout":
if stdout != nil {
- fmt.Fprintln(stdout, l.String(logOpts))
+ if l.Partial() {
+ fmt.Fprint(stdout, l.String(logOpts))
+ } else {
+ fmt.Fprintln(stdout, l.String(logOpts))
+ }
}
case "stderr":
if stderr != nil {
- fmt.Fprintln(stderr, l.String(logOpts))
+ if l.Partial() {
+ fmt.Fprint(stderr, l.String(logOpts))
+ } else {
+ fmt.Fprintln(stderr, l.String(logOpts))
+ }
}
default:
// Warn the user if the device type does not match. Most likely the file is corrupted.