From 033743cbee180d9a4149f574375cc1201e573d06 Mon Sep 17 00:00:00 2001 From: Qi Wang Date: Wed, 10 Jun 2020 14:14:01 -0400 Subject: Fix -f logs follow with stopped container Fix -f logs follow with stopped container. Close #6531 Signed-off-by: Qi Wang --- libpod/container_log.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'libpod/container_log.go') diff --git a/libpod/container_log.go b/libpod/container_log.go index c3a84d048..36b89f1ae 100644 --- a/libpod/container_log.go +++ b/libpod/container_log.go @@ -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() }() -- cgit v1.2.3-54-g00ecf