diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-03 12:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-03 12:45:48 +0200 |
| commit | bf7d5a9ce8455e4480b5e0ef92b02099f119ee71 (patch) | |
| tree | 6a5cc5d3d9e68940c423e69e81ab375972d72f15 /libpod/container_internal.go | |
| parent | 2fbf71663248c578acd68fe393fb04fa3b2606e4 (diff) | |
| parent | 38c6199b80c5de5d965ab1bcf05820567a36813c (diff) | |
| download | podman-bf7d5a9ce8455e4480b5e0ef92b02099f119ee71.tar.gz podman-bf7d5a9ce8455e4480b5e0ef92b02099f119ee71.tar.bz2 podman-bf7d5a9ce8455e4480b5e0ef92b02099f119ee71.zip | |
Merge pull request #3483 from mheon/get_conmon_pid
Store and print PID of conmon
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 43d2b6e61..cb6c35049 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -452,6 +452,7 @@ func (c *Container) teardownStorage() error { // It does not save the results - assumes the database will do that for us func resetState(state *ContainerState) error { state.PID = 0 + state.ConmonPID = 0 state.Mountpoint = "" state.Mounted = false if state.State != define.ContainerStateExited { @@ -1043,6 +1044,8 @@ func (c *Container) stop(timeout uint) error { return err } + c.state.PID = 0 + c.state.ConmonPID = 0 c.state.StoppedByUser = true if err := c.save(); err != nil { return errors.Wrapf(err, "error saving container %s state after stopping", c.ID()) |