vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #593 from ijc25/delete-response

Browse source 
Return DeleteResponse from ContainerService.Delete
This commit is contained in:
Stephen Day 2017-03-02 10:10:58 -08:00 • committed by GitHub
commit a15aa8e9ab
6 changed files with 54 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

7
services/execution/service.go
View file

@ -116,7 +116,7 @@ func (s *Service) Start(ctx context.Context, r *api.StartRequest) (*google_proto
return empty, nil
}
func (s *Service) Delete(ctx context.Context, r *api.DeleteRequest) (*google_protobuf.Empty, error) {
func (s *Service) Delete(ctx context.Context, r *api.DeleteRequest) (*api.DeleteResponse, error) {
c, err := s.getContainer(r.ID)
if err != nil {
return nil, err
@ -125,10 +125,11 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteRequest) (*google_pro
if err != nil {
return nil, err
}
if err := runtime.Delete(ctx, c); err != nil {
status, err := runtime.Delete(ctx, c)
if err != nil {
return nil, err
}
return empty, nil
return &api.DeleteResponse{ExitStatus: status}, nil
}
func containerFromContainerd(ctx context.Context, c containerd.Container) (*container.Container, error) {