From 539b674cc774db643a1c70b3f2500e662dbd2002 Mon Sep 17 00:00:00 2001
From: Nicolas Carlier <n.carlier@nunux.org>
Date: Thu, 6 Nov 2014 16:03:59 +0000
Subject: [PATCH] fix: Merge stdout and stderr.

---
 src/worker/script_runner.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/worker/script_runner.go b/src/worker/script_runner.go
index e562c73..f6c04d1 100644
--- a/src/worker/script_runner.go
+++ b/src/worker/script_runner.go
@@ -21,7 +21,7 @@ func RunScript(work *WorkRequest) (string, error) {
 	}
 
 	scriptname := path.Join(scriptsdir, work.Name, fmt.Sprintf("%s.sh", work.Action))
-	fmt.Println("Exec script: ", scriptname)
+	fmt.Println("Exec script: ", scriptname, "...")
 
 	// Exec script...
 	cmd := exec.Command(scriptname, work.Args...)
@@ -35,16 +35,19 @@ func RunScript(work *WorkRequest) (string, error) {
 
 	defer outfile.Close()
 	cmd.Stdout = outfile
+	cmd.Stderr = outfile
 
 	err = cmd.Start()
 	if err != nil {
-		return "", err
+		return outfilename, err
 	}
 
 	err = cmd.Wait()
 	if err != nil {
-		return "", err
+		fmt.Println("Exec script: ", scriptname, "KO!")
+		return outfilename, err
 	}
 
+	fmt.Println("Exec script: ", scriptname, "OK")
 	return outfilename, nil
 }