summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorjgallucci32 <john.gallucci.iv@gmail.com>2020-06-17 07:08:52 -0700
committerjgallucci32 <john.gallucci.iv@gmail.com>2020-06-17 08:31:09 -0700
commit03e99c9b40d3ad4ba33fb63d2a3de781527ce345 (patch)
tree55a9fc7b4cf682c854067b8d5e34b9fb4e08794a /libpod
parent1acd2adccb357c317add19cea8f0daea328e8315 (diff)
downloadpodman-03e99c9b40d3ad4ba33fb63d2a3de781527ce345.tar.gz
podman-03e99c9b40d3ad4ba33fb63d2a3de781527ce345.tar.bz2
podman-03e99c9b40d3ad4ba33fb63d2a3de781527ce345.zip
Revert #6591 to fix issue with failed tests
Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_log.go23
1 files changed, 0 insertions, 23 deletions
diff --git a/libpod/container_log.go b/libpod/container_log.go
index 39c395fe6..c3a84d048 100644
--- a/libpod/container_log.go
+++ b/libpod/container_log.go
@@ -2,7 +2,6 @@ package libpod
import (
"os"
- "time"
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/libpod/logs"
@@ -73,27 +72,5 @@ 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
}