containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix calculation of RunningFor in ps json output 

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #727
Approved by: rhatdan
This commit is contained in:
Matthew Heon 2018-05-04 15:39:44 -04:00 committed by Atomic Bot
parent bb0e7540dc
commit 0906b3094d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/podman/ps.go
View File

@ -395,7 +395,7 @@ func getTemplateOutput(containers []*libpod.Container, opts batchcontainer.PsOpt
runningFor := "" runningFor := ""
// If the container has not be started, the "zero" value of time is 0001-01-01 00:00:00 +0000 UTC // If the container has not be started, the "zero" value of time is 0001-01-01 00:00:00 +0000 UTC
// which would make the time elapsed about a few hundred of years. So checking for the "zero" value of time.Time // which would make the time elapsed about a few hundred of years. So checking for the "zero" value of time.Time
if batchInfo.StartedTime != (time.Time{}) { if !batchInfo.StartedTime.IsZero() {
runningFor = units.HumanDuration(time.Since(batchInfo.StartedTime)) runningFor = units.HumanDuration(time.Since(batchInfo.StartedTime))
} }
createdAt := batchInfo.ConConfig.CreatedTime.Format("2006-01-02 15:04:05 -0700 MST") createdAt := batchInfo.ConConfig.CreatedTime.Format("2006-01-02 15:04:05 -0700 MST")
@ -495,7 +495,6 @@ func getJSONOutput(containers []*libpod.Container, opts batchcontainer.PsOptions
ImageID: batchInfo.ConConfig.RootfsImageID, ImageID: batchInfo.ConConfig.RootfsImageID,
Command: batchInfo.ConConfig.Spec.Process.Args, Command: batchInfo.ConConfig.Spec.Process.Args,
CreatedAt: batchInfo.ConConfig.CreatedTime, CreatedAt: batchInfo.ConConfig.CreatedTime,
RunningFor: time.Since(batchInfo.ConConfig.CreatedTime),
Status: batchInfo.ConState.String(), Status: batchInfo.ConState.String(),
Ports: batchInfo.ConConfig.PortMappings, Ports: batchInfo.ConConfig.PortMappings,
RootFsSize: batchInfo.RootFsSize, RootFsSize: batchInfo.RootFsSize,
@ -506,6 +505,11 @@ func getJSONOutput(containers []*libpod.Container, opts batchcontainer.PsOptions
ContainerRunning: batchInfo.ConState == libpod.ContainerStateRunning, ContainerRunning: batchInfo.ConState == libpod.ContainerStateRunning,
Namespaces: ns, Namespaces: ns,
} }
if !batchInfo.StartedTime.IsZero() {
params.RunningFor = time.Since(batchInfo.StartedTime)
}
psOutput = append(psOutput, params) psOutput = append(psOutput, params)
} }
return psOutput, nil return psOutput, nil