summaryrefslogtreecommitdiff
path: root/libpod/container_log.go
diff options
context:
space:
mode:
Diffstat (limited to 'libpod/container_log.go')
-rw-r--r--libpod/container_log.go23
1 files changed, 23 insertions, 0 deletions
diff --git a/libpod/container_log.go b/libpod/container_log.go
index c3a84d048..39c395fe6 100644
--- a/libpod/container_log.go
+++ b/libpod/container_log.go
@@ -2,6 +2,7 @@ package libpod
import (
"os"
+ "time"
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/libpod/logs"
@@ -72,5 +73,27 @@ func (c *Container) readFromLogFile(options *logs.LogOptions, logChannel chan *l
}
options.WaitGroup.Done()
}()
+ // Check if container is still running or paused
+ go func() {
+ if options.Follow {
+ for {
+ state, err := c.State()
+ if err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
+ logrus.Error(err)
+ break
+ } else if err != nil {
+ break
+ }
+ if state != define.ContainerStateRunning && state != define.ContainerStatePaused {
+ err := t.Stop()
+ if err != nil {
+ logrus.Error(err)
+ }
+ break
+ }
+ time.Sleep(1 * time.Second)
+ }
+ }
+ }()
return nil
}