opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-18 07:28:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman logs -f: does not detect container stop or rm

Browse Source 
If a container stops, we should stop the logging capability and
gracefully exit. However, if the container pauses, we should allow
the log to continue.

Resolves issue: #435
Signed-off-by: baude <bbaude@redhat.com>

Closes: #437
Approved by: baude
This commit is contained in:
baude
2018-03-02 08:38:52 -06:00
committed by Atomic Bot
parent 656840c992
commit 0c4a276a04
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/podman/logs.go
View File

@ -129,14 +129,14 @@ func logsCmd(c *cli.Context) error {
defer file.Close()
reader := bufio.NewReader(file)
if opts.follow {
followLog(reader, opts)
followLog(reader, opts, ctr)
} else {
dumpLog(reader, opts)
}
return err
}
func followLog(reader *bufio.Reader, opts logOptions) error {
func followLog(reader *bufio.Reader, opts logOptions, ctr *libpod.Container) error {
var cacheOutput []string
firstPass := false
if opts.tail > 0 {
@ -161,6 +161,14 @@ func followLog(reader *bufio.Reader, opts logOptions) error {
continue
}
time.Sleep(1 * time.Second)
// Check if container is still running or paused
state, err := ctr.State()
if err != nil {
return err
}
if state != libpod.ContainerStateRunning && state != libpod.ContainerStatePaused {
break
}
continue
}
// exits