Merge pull request #3672 from crosbymichael/kill-errors

dmcgowan · web-flow · commit 51f8807d02ef · 2019-09-23T16:15:16.000-07:00
Check for more kill error types
diff --git a/pkg/process/utils.go b/pkg/process/utils.go
@@ -127,6 +127,7 @@ func checkKillError(err error) error {
 	}
 	if strings.Contains(err.Error(), "os: process already finished") ||
 		strings.Contains(err.Error(), "container not running") ||
+		strings.Contains(strings.ToLower(err.Error()), "no such process") ||
 		err == unix.ESRCH {
 		return errors.Wrapf(errdefs.ErrNotFound, "process already finished")
 	}

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ func checkKillError(err error) error {`
`127`	`127`	`}`
`128`	`128`	`if strings.Contains(err.Error(), "os: process already finished") \|\|`
`129`	`129`	`strings.Contains(err.Error(), "container not running") \|\|`
	`130`	`+ strings.Contains(strings.ToLower(err.Error()), "no such process") \|\|`
`130`	`131`	`err == unix.ESRCH {`
`131`	`132`	`return errors.Wrapf(errdefs.ErrNotFound, "process already finished")`
`132`	`133`	`}`