Use named error return for service#StartShim
@@ -159,7 +159,7 @@ func readSpec() (*spec, error) {
return &s, nil
}
-func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (string, error) {
+func (s *service) StartShim(ctx context.Context, id, containerdBinary, containerdAddress, containerdTTRPCAddress string) (_ string, retErr error) {
cmd, err := newCommand(ctx, id, containerdBinary, containerdAddress, containerdTTRPCAddress)
if err != nil {
return "", err
@@ -202,7 +202,7 @@ func (s *service) StartShim(ctx context.Context, id, containerdBinary, container
return "", err
}
defer func() {
- if err != nil {
+ if retErr != nil {
cmd.Process.Kill()
}
}()
