From 87eed358063c18b8b8b6b8adf8f3f32c96b5c2f5 Mon Sep 17 00:00:00 2001 From: Alex Ellis Date: Mon, 6 Nov 2017 09:14:10 +0000 Subject: [PATCH] Handle nil body for GET Signed-off-by: Alex Ellis --- watchdog/main.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/watchdog/main.go b/watchdog/main.go index b823840a..836ca997 100644 --- a/watchdog/main.go +++ b/watchdog/main.go @@ -25,8 +25,14 @@ func buildFunctionInput(config *WatchdogConfig, r *http.Request) ([]byte, error) var requestBytes []byte var err error - if r.Body != nil { - defer r.Body.Close() + if r.Body == nil { + return res, nil + } + defer r.Body.Close() + + if err != nil { + log.Println(err) + return res, err } requestBytes, err = ioutil.ReadAll(r.Body) @@ -37,6 +43,7 @@ func buildFunctionInput(config *WatchdogConfig, r *http.Request) ([]byte, error) } else { res = requestBytes } + return res, err }