github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

api/types/container: nice enum values for status

Browse Source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day
2017-05-18 17:44:34 -07:00
parent 0dbe46d952
commit 178b4275ca
5 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linux/container.go
View File

@@ -57,13 +57,13 @@ func (c *Container) State(ctx context.Context) (plugin.State, error) {
}
var status plugin.Status
switch response.Status {
case container.Status_CREATED:
case container.StatusCreated:
status = plugin.CreatedStatus
case container.Status_RUNNING:
case container.StatusRunning:
status = plugin.RunningStatus
case container.Status_STOPPED:
case container.StatusStopped:
status = plugin.StoppedStatus
case container.Status_PAUSED:
case container.StatusPaused:
status = plugin.PausedStatus
// TODO: containerd.DeletedStatus
}

14
linux/shim/service.go
View File

@@ -160,16 +160,16 @@ func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.
if err != nil {
return nil, err
}
status := container.Status_UNKNOWN
status := container.StatusUnknown
switch st {
case "created":
status = container.Status_CREATED
status = container.StatusCreated
case "running":
status = container.Status_RUNNING
status = container.StatusRunning
case "stopped":
status = container.Status_STOPPED
status = container.StatusStopped
case "paused":
status = container.Status_PAUSED
status = container.StatusPaused
}
o := &shimapi.StateResponse{
ID: s.id,
@@ -181,12 +181,12 @@ func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.
s.mu.Lock()
defer s.mu.Unlock()
for _, p := range s.processes {
status := container.Status_RUNNING
status := container.StatusRunning
if err := unix.Kill(p.Pid(), 0); err != nil {
if err != syscall.ESRCH {
return nil, err
}
status = container.Status_STOPPED
status = container.StatusStopped
}
o.Processes = append(o.Processes, &container.Process{
Pid: uint32(p.Pid()),