From 448313719814b4194a8b12e74f5f77e5b7024078 Mon Sep 17 00:00:00 2001
From: "A. Svensson" <lmasvensson@gmail.com>
Date: Sun, 24 May 2015 17:38:44 +0200
Subject: [PATCH] Handle errors from external scripts run by update_graphs.go.

---
 bin/update_graphs.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/update_graphs.go b/bin/update_graphs.go
index 4dc1ada..4eadc0d 100644
--- a/bin/update_graphs.go
+++ b/bin/update_graphs.go
@@ -80,6 +80,13 @@ func setuptemppaths(prefix string, title string) (f *os.File, name string, path
 	return file, file.Name(), path
 }
 
+func runcommand(cmd string, title string, args ...string) {
+	out, err := exec.Command(cmd, args...).CombinedOutput()
+	if err != nil && len(out) > 0 {
+		log.Printf("ERROR running '%s' for '%s': \n%s\n", cmd, title, out)
+	}
+	checkerror(err)
+}
 func weeklyhistorygraph(db *sql.DB, id int, title string) {
 	prefix := "week-time-"
 	// Create a new temp file, get it's filepath and get the final storage path
@@ -110,8 +117,7 @@ func weeklyhistorygraph(db *sql.DB, id int, title string) {
 	checkerror(err)
 
 	// run the plotter against the tmp file
-	err = exec.Command("./plot_time.sh", ifilename, ofilename).Run()
-	checkerror(err)
+	runcommand("./plot_time.sh", title, ifilename, ofilename)
 
 	// close and remove the file
 	ifile.Close()
@@ -146,8 +152,7 @@ func monthlyhistorygraph(db *sql.DB, id int, title string) {
 	err = rows.Err()
 	checkerror(err)
 
-	err = exec.Command("./plot_time.sh", ifilename, ofilename).Run()
-	checkerror(err)
+	runcommand("./plot_time.sh", title, ifilename, ofilename)
 
 	ifile.Close()
 	os.Remove(ifilename)
@@ -190,8 +195,7 @@ func monthlyaveragedaygraph(db *sql.DB, id int, title string) {
 	checkerror(err)
 	// Fucking wankers and their stupid usage of sunday as the first day of week...
 
-	err = exec.Command("./plot_bar.sh", ifilename, ofilename).Run()
-	checkerror(err)
+	runcommand("./plot_bar.sh", title, ifilename, ofilename)
 
 	ifile.Close()
 	os.Remove(ifilename)