Pārlūkot izejas kodu

Merge pull request #1494 from gtardif/cancel_docker_cli_metrics

Track cancel exit code from docker cli shellout to report correct status in metrics
Nicolas De loof 4 gadi atpakaļ
vecāks
revīzija
bd5c188be6
1 mainītis faili ar 7 papildinājumiem un 2 dzēšanām
  1. 7 2
      cli/mobycli/exec.go

+ 7 - 2
cli/mobycli/exec.go

@@ -66,11 +66,16 @@ func Exec(root *cobra.Command) {
 	err := RunDocker(childExit, os.Args[1:]...)
 	childExit <- true
 	if err != nil {
-		metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
-
 		if exiterr, ok := err.(*exec.ExitError); ok {
+			exitCode := exiterr.ExitCode()
+			if exitCode == 130 {
+				metrics.Track(store.DefaultContextType, os.Args[1:], metrics.CanceledStatus)
+			} else {
+				metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
+			}
 			os.Exit(exiterr.ExitCode())
 		}
+		metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}