Skip to content

Commit 6a9f9e6

Browse files
authored
logging: Don't use Error when logging 4xx responses (#1159)
in the error.go case also avoid the misleading "exiting with error" message and use the original message instead. Signed-off-by: Jussi Kukkonen <[email protected]>
1 parent 48065b9 commit 6a9f9e6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

pkg/api/error.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ func handleTimestampAPIError(params interface{}, code int, err error, message st
5050
handler := re.FindStringSubmatch(typeStr)[1]
5151

5252
logMsg := func(r *http.Request) {
53-
log.RequestIDLogger(r).Errorw("exiting with error", append([]interface{}{"handler", handler, "statusCode", code, "clientMessage", message, "error", err}, fields...)...)
53+
if code < http.StatusInternalServerError {
54+
log.RequestIDLogger(r).Warnw(message, append([]interface{}{"handler", handler, "statusCode", code, "error", err}, fields...)...)
55+
} else {
56+
log.RequestIDLogger(r).Errorw(message, append([]interface{}{"handler", handler, "statusCode", code, "error", err}, fields...)...)
57+
}
5458
paramsFields := map[string]interface{}{}
5559
if err := mapstructure.Decode(params, &paramsFields); err == nil {
5660
log.RequestIDLogger(r).Debug(paramsFields)

pkg/generated/restapi/configure_timestamp_server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func cacheForDay(handler http.Handler) http.Handler {
197197
}
198198

199199
func logAndServeError(w http.ResponseWriter, r *http.Request, err error) {
200-
if apiErr, ok := err.(errors.Error); ok && apiErr.Code() == http.StatusNotFound {
200+
if apiErr, ok := err.(errors.Error); ok && apiErr.Code() < http.StatusInternalServerError {
201201
log.RequestIDLogger(r).Warn(err)
202202
} else {
203203
log.RequestIDLogger(r).Error(err)

0 commit comments

Comments
 (0)