diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-24 14:16:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 14:16:22 -0400 |
| commit | 23f9565547ae2a6b0154e6913abf7f1232f0ece0 (patch) | |
| tree | 4c82eb688848627c86dcfa1240753a0a271cc636 /libpod/oci_conmon_linux.go | |
| parent | 24ee67bb09ffd6cf970fd0041757cd98e065e848 (diff) | |
| parent | 3007bd4a9939c0ed8160a319f70788c19e419435 (diff) | |
| download | podman-23f9565547ae2a6b0154e6913abf7f1232f0ece0.tar.gz podman-23f9565547ae2a6b0154e6913abf7f1232f0ece0.tar.bz2 podman-23f9565547ae2a6b0154e6913abf7f1232f0ece0.zip | |
Merge pull request #11263 from nalind/journal-read
libpod/Container.readFromJournal(): don't skip the first entry
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index ff25be234..c14911980 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -625,9 +625,11 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http. if err != nil { break } - _, err = httpBuf.Write([]byte("\n")) - if err != nil { - break + if !logLine.Partial() { + _, err = httpBuf.Write([]byte("\n")) + if err != nil { + break + } } err = httpBuf.Flush() if err != nil { |