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

Fix -f logs follow with stopped container

Browse Source 
Fix -f logs follow with stopped container. Close #6531

Signed-off-by: Qi Wang <qiwan@redhat.com>
This commit is contained in:
Qi Wang
2020-06-10 14:14:01 -04:00
parent 1f05606fac
commit 033743cbee
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libpod/container_log.go
View File

@ -30,6 +30,13 @@ func (c *Container) ReadLog(options *logs.LogOptions, logChannel chan *logs.LogL
}
func (c *Container) readFromLogFile(options *logs.LogOptions, logChannel chan *logs.LogLine) error {
state, err := c.State()
if err != nil {
return err
}
if state != define.ContainerStateRunning && state != define.ContainerStatePaused {
options.Follow = false
}
t, tailLog, err := logs.GetLogFile(c.LogPath(), options)
if err != nil {
// If the log file does not exist, this is not fatal.
@ -69,6 +76,14 @@ func (c *Container) readFromLogFile(options *logs.LogOptions, logChannel chan *l
if nll.Since(options.Since) {
logChannel <- nll
}
state, err := c.State()
if err != nil {
logrus.Error(err)
break
}
if options.Follow && state != define.ContainerStateRunning && state != define.ContainerStatePaused {
t.Kill(err)
}
}
options.WaitGroup.Done()
}()