Merge pull request #84 from stevekuznetsov/skuznets/better-logging

handlers: stop double-logging errors
kubernetes-sigs · May 21, 2021 · 36bb085 · 36bb085
2 parents faafeaa + 1b4e32c
commit 36bb085
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/handlers/handlers.go b/handlers/handlers.go
@@ -415,13 +415,12 @@ func handleMetric(r *ranch.Ranch) http.HandlerFunc {
 }
 
 func returnAndLogError(res http.ResponseWriter, err error, logMsg string) {
-	logMsg = fmt.Sprintf("%s: %v", logMsg, err)
 	log := logrus.WithError(err)
 	httpStatus := errorToStatus(err)
 	if httpStatus > 499 {
 		log.Error(logMsg)
 	} else {
 		log.Debug(logMsg)
 	}
-	http.Error(res, logMsg, httpStatus)
+	http.Error(res, fmt.Sprintf("%s: %v", logMsg, err), httpStatus)
 }