mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
4002eac8b8
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 <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
84 lines
1.3 KiB
Go
84 lines
1.3 KiB
Go
package runtime
|
|
|
|
import (
|
|
"fmt"
|
|
"github.com/dotcloud/docker/utils"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
type State struct {
|
|
sync.RWMutex
|
|
Running bool
|
|
Pid int
|
|
ExitCode int
|
|
StartedAt time.Time
|
|
FinishedAt time.Time
|
|
Ghost bool
|
|
}
|
|
|
|
// String returns a human-readable description of the state
|
|
func (s *State) String() string {
|
|
s.RLock()
|
|
defer s.RUnlock()
|
|
|
|
if s.Running {
|
|
if s.Ghost {
|
|
return fmt.Sprintf("Ghost")
|
|
}
|
|
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)))
|
|
}
|
|
|
|
func (s *State) IsRunning() bool {
|
|
s.RLock()
|
|
defer s.RUnlock()
|
|
|
|
return s.Running
|
|
}
|
|
|
|
func (s *State) IsGhost() bool {
|
|
s.RLock()
|
|
defer s.RUnlock()
|
|
|
|
return s.Ghost
|
|
}
|
|
|
|
func (s *State) GetExitCode() int {
|
|
s.RLock()
|
|
defer s.RUnlock()
|
|
|
|
return s.ExitCode
|
|
}
|
|
|
|
func (s *State) SetGhost(val bool) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
s.Ghost = val
|
|
}
|
|
|
|
func (s *State) SetRunning(pid int) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
s.Running = true
|
|
s.Ghost = false
|
|
s.ExitCode = 0
|
|
s.Pid = pid
|
|
s.StartedAt = time.Now().UTC()
|
|
}
|
|
|
|
func (s *State) SetStopped(exitCode int) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
|
|
s.Running = false
|
|
s.Pid = 0
|
|
s.FinishedAt = time.Now().UTC()
|
|
s.ExitCode = exitCode
|
|
}
|