From ddc973c3418a40eb54db8461298acdb975cd7633 Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Wed, 19 Jul 2017 17:41:38 +0100 Subject: [PATCH] Watchdog - Write error / stack to caller. --- watchdog/main.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/watchdog/main.go b/watchdog/main.go index 324232a7..fdb2e57c 100644 --- a/watchdog/main.go +++ b/watchdog/main.go @@ -85,7 +85,13 @@ func pipeRequest(config *WatchdogConfig, w http.ResponseWriter, r *http.Request, if buildInputErr != nil { ri.headerWritten = true w.WriteHeader(http.StatusBadRequest) + // I.e. "exit code 1" w.Write([]byte(buildInputErr.Error())) + + // Verbose message - i.e. stack trace + w.Write([]byte("\n")) + w.Write(out) + return } } @@ -144,6 +150,10 @@ func pipeRequest(config *WatchdogConfig, w http.ResponseWriter, r *http.Request, w.WriteHeader(http.StatusInternalServerError) response := bytes.NewBufferString(err.Error()) w.Write(response.Bytes()) + w.Write([]byte("\n")) + if len(out) > 0 { + w.Write(out) + } ri.headerWritten = true } return