Fix exit code 1 on server Ctrl+C

temporalio · Feb 24, 2023 · 4f516cc · 4f516cc
1 parent ab85e37
commit 4f516cc
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/app/app.go b/app/app.go
@@ -64,19 +64,19 @@ func configureCLI(ctx *cli.Context) error {
 }
 
 func HandleError(c *cli.Context, err error) {
-	if err == nil {
-		return
+	if exitErr, ok := err.(cli.ExitCoder); ok {
+		if exitErr.ExitCode() != 0 {
+			fmt.Fprintf(os.Stderr, "%s %+v\n", color.Red(c, "Error:"), err)
+			if os.Getenv(common.ShowErrorStackEnv) != `` {
+				fmt.Fprintln(os.Stderr, color.Magenta(c, "Stack trace:"))
+				debug.PrintStack()
+			} else {
+				fmt.Fprintf(os.Stderr, "('export %s=1' to see stack traces)\n", common.ShowErrorStackEnv)
+			}
+		}
 	}
 
-	fmt.Fprintf(os.Stderr, "%s %+v\n", color.Red(c, "Error:"), err)
-	if os.Getenv(common.ShowErrorStackEnv) != `` {
-		fmt.Fprintln(os.Stderr, color.Magenta(c, "Stack trace:"))
-		debug.PrintStack()
-	} else {
-		fmt.Fprintf(os.Stderr, "('export %s=1' to see stack traces)\n", common.ShowErrorStackEnv)
-	}
-
-	cli.OsExiter(1)
+	cli.HandleExitCoder(err)
 }
 
 func commands(defaultCfg *sconfig.Config) []*cli.Command {