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 /libpod | |
| 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 'libpod')
| -rw-r--r-- | libpod/logs/log.go | 12 | ||||
| -rw-r--r-- | libpod/oci_conmon_linux.go | 8 |
2 files changed, 5 insertions, 15 deletions
diff --git a/libpod/logs/log.go b/libpod/logs/log.go index a584de0ee..1a0223edc 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -251,19 +251,11 @@ func (l *LogLine) Write(stdout io.Writer, stderr io.Writer, logOpts *LogOptions) switch l.Device { case "stdout": if stdout != nil { - if l.Partial() { - fmt.Fprint(stdout, l.String(logOpts)) - } else { - fmt.Fprintln(stdout, l.String(logOpts)) - } + fmt.Fprintln(stdout, l.String(logOpts)) } case "stderr": if stderr != nil { - if l.Partial() { - fmt.Fprint(stderr, l.String(logOpts)) - } else { - fmt.Fprintln(stderr, l.String(logOpts)) - } + fmt.Fprintln(stderr, l.String(logOpts)) } default: // Warn the user if the device type does not match. Most likely the file is corrupted. diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index c00d83f95..924df2310 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -624,11 +624,9 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http. if err != nil { break } - if !logLine.Partial() { - _, err = httpBuf.Write([]byte("\n")) - if err != nil { - break - } + _, err = httpBuf.Write([]byte("\n")) + if err != nil { + break } err = httpBuf.Flush() if err != nil { |