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_inspect.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_inspect.go')
| -rw-r--r-- | libpod/container_inspect.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 6085f1210..938a5b210 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -145,6 +145,7 @@ type InspectContainerState struct { OOMKilled bool `json:"OOMKilled"` Dead bool `json:"Dead"` Pid int `json:"Pid"` + ConmonPid int `json:"ConmonPid,omitempty"` ExitCode int32 `json:"ExitCode"` Error string `json:"Error"` // TODO StartedAt time.Time `json:"StartedAt"` @@ -261,6 +262,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *driver.Data) OOMKilled: runtimeInfo.OOMKilled, Dead: runtimeInfo.State.String() == "bad state", Pid: runtimeInfo.PID, + ConmonPid: runtimeInfo.ConmonPID, ExitCode: runtimeInfo.ExitCode, Error: "", // can't get yet StartedAt: runtimeInfo.StartedTime, |