Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit bd5c188

Browse files
authored
Merge pull request #1494 from gtardif/cancel_docker_cli_metrics
Track cancel exit code from docker cli shellout to report correct status in metrics
2 parents acfdd23 + 6465bfe commit bd5c188

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

cli/mobycli/exec.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,16 @@ func Exec(root *cobra.Command) {
6666
err := RunDocker(childExit, os.Args[1:]...)
6767
childExit <- true
6868
if err != nil {
69-
metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
70-
7169
if exiterr, ok := err.(*exec.ExitError); ok {
70+
exitCode := exiterr.ExitCode()
71+
if exitCode == 130 {
72+
metrics.Track(store.DefaultContextType, os.Args[1:], metrics.CanceledStatus)
73+
} else {
74+
metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
75+
}
7276
os.Exit(exiterr.ExitCode())
7377
}
78+
metrics.Track(store.DefaultContextType, os.Args[1:], metrics.FailureStatus)
7479
fmt.Fprintln(os.Stderr, err)
7580
os.Exit(1)
7681
}

0 commit comments

Comments
 (0)