From 8e8f727f5033b71715ff1be6f21221eb59a7cd8b Mon Sep 17 00:00:00 2001 From: Ken ICHIKAWA Date: Wed, 19 Mar 2014 12:05:54 +0900 Subject: [PATCH] Fix since time exit display when s.FinishedAt is zero When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time. For example ``` Exited (0) 292.471209 years ago ``` This patch fixes the since time exit to display nothing if s.FinishedAt is zero. Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA (github: ichik1) Upstream-commit: 4002eac8b8b4007de03e78dbd57232fac583d05b Component: engine --- components/engine/runtime/state.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/engine/runtime/state.go b/components/engine/runtime/state.go index 1c682acd26..316b8a40f1 100644 --- a/components/engine/runtime/state.go +++ b/components/engine/runtime/state.go @@ -28,6 +28,9 @@ func (s *State) String() string { } return fmt.Sprintf("Up %s", utils.HumanDuration(time.Now().UTC().Sub(s.StartedAt))) } + if s.FinishedAt.IsZero() { + return "" + } return fmt.Sprintf("Exited (%d) %s ago", s.ExitCode, utils.HumanDuration(time.Now().UTC().Sub(s.FinishedAt))) }