diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-11 15:00:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 15:00:57 -0400 |
| commit | 1deb4d1d70efb6d62f4fe5e735c94523f930b6d7 (patch) | |
| tree | 394020b1a48f76cd283e450d6952cf08a4f53dde /libpod/logs | |
| parent | 9a9ad853cb6781460829cb139cecbf9aff37896d (diff) | |
| parent | 3f2cab86433859a1facf1996ad68dac23c9899b9 (diff) | |
| download | podman-1deb4d1d70efb6d62f4fe5e735c94523f930b6d7.tar.gz podman-1deb4d1d70efb6d62f4fe5e735c94523f930b6d7.tar.bz2 podman-1deb4d1d70efb6d62f4fe5e735c94523f930b6d7.zip | |
Merge pull request #7289 from vrothberg/v2-backports
V2 backports
Diffstat (limited to 'libpod/logs')
| -rw-r--r-- | libpod/logs/log.go | 12 | ||||
| -rw-r--r-- | libpod/logs/reversereader/reversereader.go | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libpod/logs/log.go b/libpod/logs/log.go index 03acadb18..f66cbbadd 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -101,11 +101,14 @@ func getTailLog(path string, tail int) ([]*LogLine, error) { if err != nil { if errors.Cause(err) == io.EOF { inputs <- []string{leftover} - close(inputs) - break + } else { + logrus.Error(err) } - logrus.Error(err) close(inputs) + if err := f.Close(); err != nil { + logrus.Error(err) + } + break } line := strings.Split(s+leftover, "\n") if len(line) > 1 { @@ -136,9 +139,6 @@ func getTailLog(path string, tail int) ([]*LogLine, error) { } // if we have enough loglines, we can hangup if nllCounter >= tail { - if err := f.Close(); err != nil { - logrus.Error(err) - } break } } diff --git a/libpod/logs/reversereader/reversereader.go b/libpod/logs/reversereader/reversereader.go index 72d9ad975..4fa1a3f88 100644 --- a/libpod/logs/reversereader/reversereader.go +++ b/libpod/logs/reversereader/reversereader.go @@ -60,7 +60,7 @@ func (r *ReverseReader) Read() (string, error) { if int64(n) < r.readSize { b = b[0:n] } - // Set to the next page boundary - r.offset = -r.readSize + // Move the offset one pagesize up + r.offset -= r.readSize return string(b), nil } |