Merge pull request #18 from dave-shawley/exit-status

Exit with failure when child does

Author: gmr

main.go

@@ -26,7 +26,10 @@ func main() {
 	app.Action = func(c *cli.Context) error {
 		return action(c)
 	}
-	app.Run(os.Args)
+	err := app.Run(os.Args)
+	if err != nil {
+		log.Fatal(err)
+	}
 }
 
 func action(c *cli.Context) error {
@@ -47,7 +50,7 @@ func action(c *cli.Context) error {
 
 	params, err := getParameters(c)
 	if err != nil {
-		return cli.NewExitError(errorPrefix(err), code)
+		return cli.NewExitError(errorPrefix(err), -1)
 	}
 
 	envVars := BuildEnvVars(
@@ -66,6 +69,9 @@ func action(c *cli.Context) error {
 
 	err = RunCommand(c.Args()[0], c.Args()[1:], envVars)
 	if err != nil {
+		if cmdError, ok := err.(*CommandFailedError); ok {
+			return cli.NewExitError(errorPrefix(err), cmdError.ExitCode)
+		}
 		return cli.NewExitError(errorPrefix(err), 128)
 	}
 

runner.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 	"os/signal"
 	"strings"
@@ -9,6 +10,14 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+type CommandFailedError struct {
+	ExitCode int
+}
+
+func (e *CommandFailedError) Error() string {
+	return fmt.Sprintf("Command failed with exit code %d", e.ExitCode)
+}
+
 func RunCommand(command string, args []string, envVars []string) error {
 
 	log.Infof("PID %v running %s %s", os.Getpid(), command,
@@ -53,7 +62,12 @@ func RunCommand(command string, args []string, envVars []string) error {
 			"signal": sigv},
 		).Info("Caught signal, sent to child")
 	}()
-	_, err = proc.Wait()
-	log.Debug("Exiting")
-	return err
+	procState, err := proc.Wait()
+	if err != nil {
+		return err
+	}
+	if procState.ExitCode() != 0 {
+		return &CommandFailedError{procState.ExitCode()}
+	}
+	return nil
 }