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

Rename TaskStatus to Status

Browse Source 
This can be renamed because both Tasks and Processes share the same
status consts

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-07-31 16:07:57 -04:00
parent 504033e373
commit cd00216fd7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
process.go
View File

@ -124,7 +124,7 @@ func (p *process) Delete(ctx context.Context) (uint32, error) {
return r.ExitStatus, nil return r.ExitStatus, nil
} }
func (p *process) Status(ctx context.Context) (TaskStatus, error) { func (p *process) Status(ctx context.Context) (Status, error) {
r, err := p.task.client.TaskService().Get(ctx, &tasks.GetRequest{ r, err := p.task.client.TaskService().Get(ctx, &tasks.GetRequest{
ContainerID: p.task.id, ContainerID: p.task.id,
ExecID: p.id, ExecID: p.id,
@ -132,5 +132,5 @@ func (p *process) Status(ctx context.Context) (TaskStatus, error) {
if err != nil { if err != nil {
return "", errdefs.FromGRPC(err) return "", errdefs.FromGRPC(err)
} }
return TaskStatus(strings.ToLower(r.Process.Status.String())), nil return Status(strings.ToLower(r.Process.Status.String())), nil
} }

20
task.go
View File

@ -28,14 +28,14 @@ import (
const UnknownExitStatus = 255 const UnknownExitStatus = 255
type TaskStatus string type Status string
const ( const (
Running TaskStatus = "running" Running Status = "running"
Created TaskStatus = "created" Created Status = "created"
Stopped TaskStatus = "stopped" Stopped Status = "stopped"
Paused TaskStatus = "paused" Paused Status = "paused"
Pausing TaskStatus = "pausing" Pausing Status = "pausing"
) )
type IOCloseInfo struct { type IOCloseInfo struct {
@ -68,7 +68,7 @@ type Task interface {
Pause(context.Context) error Pause(context.Context) error
Resume(context.Context) error Resume(context.Context) error
Start(context.Context) error Start(context.Context) error
Status(context.Context) (TaskStatus, error) Status(context.Context) (Status, error)
Wait(context.Context) (uint32, error) Wait(context.Context) (uint32, error)
Exec(context.Context, string, *specs.Process, IOCreation) (Process, error) Exec(context.Context, string, *specs.Process, IOCreation) (Process, error)
Pids(context.Context) ([]uint32, error) Pids(context.Context) ([]uint32, error)
@ -88,7 +88,7 @@ type Process interface {
CloseIO(context.Context, ...IOCloserOpts) error CloseIO(context.Context, ...IOCloserOpts) error
Resize(ctx context.Context, w, h uint32) error Resize(ctx context.Context, w, h uint32) error
IO() *IO IO() *IO
Status(context.Context) (TaskStatus, error) Status(context.Context) (Status, error)
} }
var _ = (Task)(&task{}) var _ = (Task)(&task{})
@ -153,14 +153,14 @@ func (t *task) Resume(ctx context.Context) error {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
func (t *task) Status(ctx context.Context) (TaskStatus, error) { func (t *task) Status(ctx context.Context) (Status, error) {
r, err := t.client.TaskService().Get(ctx, &tasks.GetRequest{ r, err := t.client.TaskService().Get(ctx, &tasks.GetRequest{
ContainerID: t.id, ContainerID: t.id,
}) })
if err != nil { if err != nil {
return "", errdefs.FromGRPC(err) return "", errdefs.FromGRPC(err)
} }
return TaskStatus(strings.ToLower(r.Process.Status.String())), nil return Status(strings.ToLower(r.Process.Status.String())), nil
} }
// Wait is a blocking call that will wait for the task to exit and return the exit status // Wait is a blocking call that will wait for the task to exit and return the exit status