summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Haines <william.haines@colorado.edu>2020-06-10 12:40:19 -0600
committerWill Haines <william.haines@colorado.edu>2020-06-10 15:08:48 -0600
commit86ffa552d2af02bdcc06e8a0e93095b7d0110395 (patch)
tree41775c4859ebc015617db3958d34c16d99d96f1f
parentb2200dbe056ac409461033f646cdd25bcccea521 (diff)
downloadpodman-86ffa552d2af02bdcc06e8a0e93095b7d0110395.tar.gz
podman-86ffa552d2af02bdcc06e8a0e93095b7d0110395.tar.bz2
podman-86ffa552d2af02bdcc06e8a0e93095b7d0110395.zip
Fixed bug where 'podman log <container>' would truncate some lines.
Signed-off-by: Will Haines <william.haines@colorado.edu>
-rw-r--r--libpod/container_log.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_log.go b/libpod/container_log.go
index bfa303e84..c3a84d048 100644
--- a/libpod/container_log.go
+++ b/libpod/container_log.go
@@ -19,7 +19,7 @@ func (r *Runtime) Log(containers []*Container, options *logs.LogOptions, logChan
return nil
}
-// ReadLog reads a containers log based on the input options and returns loglines over a channel
+// ReadLog reads a containers log based on the input options and returns loglines over a channel.
func (c *Container) ReadLog(options *logs.LogOptions, logChannel chan *logs.LogLine) error {
// TODO Skip sending logs until journald logs can be read
// TODO make this not a magic string
@@ -61,7 +61,7 @@ func (c *Container) readFromLogFile(options *logs.LogOptions, logChannel chan *l
partial += nll.Msg
continue
} else if !nll.Partial() && len(partial) > 1 {
- nll.Msg = partial
+ nll.Msg = partial + nll.Msg
partial = ""
}
nll.CID = c.ID()