From 7559cf8f7a23a527cbe9b38fdc4092a2e416fc17 Mon Sep 17 00:00:00 2001 From: JT Olds Date: Mon, 20 Feb 2017 21:58:53 -0700 Subject: [PATCH] whjson: fix error status codes --- whjson/json.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/whjson/json.go b/whjson/json.go index 536d4dd..2d55f14 100644 --- a/whjson/json.go +++ b/whjson/json.go @@ -23,17 +23,18 @@ var ( ErrHandler = wherr.HandlerFunc(errHandler) ) -func errHandler(w http.ResponseWriter, r *http.Request, err error) { - log.Printf("error: %v", err) +func errHandler(w http.ResponseWriter, r *http.Request, handledErr error) { + log.Printf("error: %v", handledErr) data, err := json.MarshalIndent(map[string]string{ - "err": errhttp.GetErrorBody(err)}, "", " ") + "err": errhttp.GetErrorBody(handledErr)}, "", " ") if err != nil { - log.Printf("failed serializing error: %v", err) + log.Printf("failed serializing error: %v", handledErr) data = []byte(`{"err": "Internal Server Error"}`) } w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Length", fmt.Sprint(len(data))) - w.WriteHeader(errhttp.GetStatusCode(err, http.StatusInternalServerError)) + w.WriteHeader(errhttp.GetStatusCode(handledErr, + http.StatusInternalServerError)) w.Write(data) }