whjson: fix error status codes

go-webhelp · Feb 21, 2017 · 7559cf8 · 7559cf8
1 parent 986a5e3
commit 7559cf8
Showing 1 changed file with 6 additions and 5 deletions.
diff --git 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)
 }