diff options
| -rw-r--r-- | libpod/container_log.go | 15 | ||||
| -rw-r--r-- | test/e2e/logs_test.go | 12 |
2 files changed, 27 insertions, 0 deletions
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() }() diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index f36163ccc..f9446e0c6 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -288,4 +288,16 @@ var _ = Describe("Podman logs", func() { logc.WaitWithDefaultTimeout() Expect(logc).To(Exit(0)) }) + + It("follow output stopped container", func() { + containerName := "logs-f" + + logc := podmanTest.Podman([]string{"run", "--name", containerName, "-d", ALPINE}) + logc.WaitWithDefaultTimeout() + Expect(logc).To(Exit(0)) + + results := podmanTest.Podman([]string{"logs", "-f", containerName}) + results.WaitWithDefaultTimeout() + Expect(results).To(Exit(0)) + }) }) |