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

Fix -f logs to stop when a container exits

Browse Source 
Fixes an issue with the previous PR where a container would exit while following logs and the log tail continued to follow. This creates a subroutine which checks the state of the container and instructs the tailLog to stop when it reaches EOF.

Tested the following conditions:
* Tail and follow logs of running container
* Tail and follow logs of stopped container
* Tail and follow logs of running container which exits after some time

Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
This commit is contained in:
jgallucci32
2020-06-11 22:03:02 -07:00
committed by jgallucci32
parent 033743cbee
commit 9ac115e691
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libpod/container_log.go
View File

@ -2,6 +2,7 @@ package libpod
import ( import (
"os" "os"
"time"
"github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/libpod/logs" "github.com/containers/libpod/libpod/logs"
@ -30,13 +31,6 @@ func (c *Container) ReadLog(options *logs.LogOptions, logChannel chan *logs.LogL
} }
func (c *Container) readFromLogFile(options *logs.LogOptions, logChannel chan *logs.LogLine) error { 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) t, tailLog, err := logs.GetLogFile(c.LogPath(), options)
if err != nil { if err != nil {
// If the log file does not exist, this is not fatal. // If the log file does not exist, this is not fatal.
@ -76,16 +70,25 @@ func (c *Container) readFromLogFile(options *logs.LogOptions, logChannel chan *l
if nll.Since(options.Since) { if nll.Since(options.Since) {
logChannel <- nll 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() options.WaitGroup.Done()
}() }()
// Check if container is still running or paused
go func() {
if options.Follow {
for {
state, err := c.State()
if err != nil {
logrus.Error(err)
break
}
if state != define.ContainerStateRunning && state != define.ContainerStatePaused {
t.StopAtEOF()
break
}
time.Sleep(1 * time.Second)
}
}
}()
return nil return nil
} }