opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 01:19:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6561 from CUB-OIT-PE/fix-truncated-logs

Browse Source 
Fixed bug where 'podman log <container>' would truncate some lines.
This commit is contained in:
OpenShift Merge Robot
2020-06-11 04:45:52 -04:00
committed by GitHub
parent b2200dbe05 86ffa552d2
commit 7b85d5c6d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_log.go
View File

@ -19,7 +19,7 @@ func (r *Runtime) Log(containers []*Container, options *logs.LogOptions, logChan
return nil 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 { func (c *Container) ReadLog(options *logs.LogOptions, logChannel chan *logs.LogLine) error {
// TODO Skip sending logs until journald logs can be read // TODO Skip sending logs until journald logs can be read
// TODO make this not a magic string // TODO make this not a magic string
@ -61,7 +61,7 @@ func (c *Container) readFromLogFile(options *logs.LogOptions, logChannel chan *l
partial += nll.Msg partial += nll.Msg
continue continue
} else if !nll.Partial() && len(partial) > 1 { } else if !nll.Partial() && len(partial) > 1 {
nll.Msg = partial nll.Msg = partial + nll.Msg
partial = "" partial = ""
} }
nll.CID = c.ID() nll.CID = c.ID()