docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

container: Use state strings from dockerclient instead of embedding 

them.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2015-05-07 15:41:03 -07:00
parent 4f1c9597d8
commit 5ee115fcd5
2 changed files with 3 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/handlers.go
View File

@ -158,7 +158,7 @@ func getContainersJSON(c *context, w http.ResponseWriter, r *http.Request) {
if !filters.MatchKVList("label", container.Config.Labels) { if !filters.MatchKVList("label", container.Config.Labels) {
continue continue
} }
if !filters.Match("status", container.StateString()) { if !filters.Match("status", container.Info.State.StateString()) {
continue continue
} }
@ -193,7 +193,7 @@ func getContainersJSON(c *context, w http.ResponseWriter, r *http.Request) {
// Update the Status. The one we have is stale from the last `docker ps` the engine sent. // Update the Status. The one we have is stale from the last `docker ps` the engine sent.
// `Status()` will generate a new one // `Status()` will generate a new one
tmp.Status = container.Status() tmp.Status = container.Info.State.String()
if !container.Engine.IsHealthy() { if !container.Engine.IsHealthy() {
tmp.Status = "Pending" tmp.Status = "Pending"
} }

55
cluster/container.go
View File

@ -1,12 +1,6 @@
package cluster package cluster
import ( import "github.com/samalba/dockerclient"
"fmt"
"time"
"github.com/docker/docker/pkg/units"
"github.com/samalba/dockerclient"
)
// Container is exported // Container is exported
type Container struct { type Container struct {
@ -16,50 +10,3 @@ type Container struct {
Info dockerclient.ContainerInfo Info dockerclient.ContainerInfo
Engine *Engine Engine *Engine
} }
// Status returns a human-readable description of the state
// Stoken from docker/docker/daemon/state.go
func (c *Container) Status() string {
s := c.Info.State
if s.Running {
if s.Paused {
return fmt.Sprintf("Up %s (Paused)", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt)))
}
if s.Restarting {
return fmt.Sprintf("Restarting (%d) %s ago", s.ExitCode, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)))
}
return fmt.Sprintf("Up %s", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt)))
}
if s.Dead {
return "Dead"
}
if s.FinishedAt.IsZero() {
return ""
}
return fmt.Sprintf("Exited (%d) %s ago", s.ExitCode, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)))
}
// StateString returns a single string to describe state
// Stoken from docker/docker/daemon/state.go
func (c *Container) StateString() string {
s := c.Info.State
if s.Running {
if s.Paused {
return "paused"
}
if s.Restarting {
return "restarting"
}
return "running"
}
if s.Dead {
return "dead"
}
return "exited"
}