erki/ss13_se
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle errors from external scripts run by update_graphs.go.

Browse Source
This commit is contained in:
A. Svensson 2015-05-24 17:38:44 +02:00
parent 86eac2f50a
commit 4483137198
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/update_graphs.go
View File

@ -80,6 +80,13 @@ func setuptemppaths(prefix string, title string) (f *os.File, name string, path
return file, file.Name(), 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) { func weeklyhistorygraph(db *sql.DB, id int, title string) {
prefix := "week-time-" prefix := "week-time-"
// Create a new temp file, get it's filepath and get the final storage path // 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) checkerror(err)
// run the plotter against the tmp file // run the plotter against the tmp file
err = exec.Command("./plot_time.sh", ifilename, ofilename).Run() runcommand("./plot_time.sh", title, ifilename, ofilename)
checkerror(err)
// close and remove the file // close and remove the file
ifile.Close() ifile.Close()
@ -146,8 +152,7 @@ func monthlyhistorygraph(db *sql.DB, id int, title string) {
err = rows.Err() err = rows.Err()
checkerror(err) checkerror(err)
err = exec.Command("./plot_time.sh", ifilename, ofilename).Run() runcommand("./plot_time.sh", title, ifilename, ofilename)
checkerror(err)
ifile.Close() ifile.Close()
os.Remove(ifilename) os.Remove(ifilename)
@ -190,8 +195,7 @@ func monthlyaveragedaygraph(db *sql.DB, id int, title string) {
checkerror(err) checkerror(err)
// Fucking wankers and their stupid usage of sunday as the first day of week... // Fucking wankers and their stupid usage of sunday as the first day of week...
err = exec.Command("./plot_bar.sh", ifilename, ofilename).Run() runcommand("./plot_bar.sh", title, ifilename, ofilename)
checkerror(err)
ifile.Close() ifile.Close()
os.Remove(ifilename) os.Remove(ifilename)