Fix Wait() on process/tasks

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-06-21 13:32:56 -07:00
parent 8830866eed
commit 8b2cf6e8e6
15 changed files with 238 additions and 179 deletions

View File

@@ -198,26 +198,21 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteTaskRequest) (*api.De
if err != nil {
return nil, err
}
state, err := t.State(ctx)
if err != nil {
return nil, err
}
exit, err := runtime.Delete(ctx, t)
if err != nil {
return nil, err
}
if err := s.emit(ctx, "/tasks/delete", event.TaskDelete{
ContainerID: r.ContainerID,
Pid: state.Pid,
Pid: exit.Pid,
ExitStatus: exit.Status,
}); err != nil {
return nil, err
}
return &api.DeleteResponse{
ExitStatus: exit.Status,
ExitedAt: exit.Timestamp,
Pid: exit.Pid,
}, nil
}
@@ -233,6 +228,7 @@ func (s *Service) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest
return &api.DeleteResponse{
ExitStatus: exit.Status,
ExitedAt: exit.Timestamp,
Pid: exit.Pid,
}, nil
}