EliChin/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#728] Remove redundant log message

Browse source 
Signed-off-by: Angira Kekteeva <kira@nspcc.ru>
This commit is contained in:
Angira Kekteeva 2022-10-25 19:14:46 +04:00 committed by Alex Vanin
parent bbd7ba670a
commit 712740b668
3 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
api/handler/util.go
View file

@ -16,15 +16,17 @@ import (
) )
func (h *handler) logAndSendError(w http.ResponseWriter, logText string, reqInfo *api.ReqInfo, err error, additional ...zap.Field) { func (h *handler) logAndSendError(w http.ResponseWriter, logText string, reqInfo *api.ReqInfo, err error, additional ...zap.Field) {
fields := []zap.Field{zap.String("request_id", reqInfo.RequestID), code := api.WriteErrorResponse(w, reqInfo, transformToS3Error(err))
fields := []zap.Field{
zap.Int("status", code),
zap.String("request_id", reqInfo.RequestID),
zap.String("method", reqInfo.API), zap.String("method", reqInfo.API),
zap.String("bucket_name", reqInfo.BucketName), zap.String("bucket", reqInfo.BucketName),
zap.String("object_name", reqInfo.ObjectName), zap.String("object", reqInfo.ObjectName),
zap.String("description", logText),
zap.Error(err)} zap.Error(err)}
fields = append(fields, additional...) fields = append(fields, additional...)
h.log.Error("call method", fields...)
h.log.Error(logText, fields...)
api.WriteErrorResponse(w, reqInfo, transformToS3Error(err))
} }
func transformToS3Error(err error) error { func transformToS3Error(err error) error {

3
api/response.go
View file

@ -110,7 +110,7 @@ var s3ErrorResponseMap = map[string]string{
} }
// WriteErrorResponse writes error headers. // WriteErrorResponse writes error headers.
func WriteErrorResponse(w http.ResponseWriter, reqInfo *ReqInfo, err error) { func WriteErrorResponse(w http.ResponseWriter, reqInfo *ReqInfo, err error) int {
code := http.StatusInternalServerError code := http.StatusInternalServerError
if e, ok := err.(errors.Error); ok { if e, ok := err.(errors.Error); ok {
@ -130,6 +130,7 @@ func WriteErrorResponse(w http.ResponseWriter, reqInfo *ReqInfo, err error) {
errorResponse := getAPIErrorResponse(reqInfo, err) errorResponse := getAPIErrorResponse(reqInfo, err)
encodedErrorResponse := EncodeResponse(errorResponse) encodedErrorResponse := EncodeResponse(errorResponse)
WriteResponse(w, code, encodedErrorResponse, MimeXML) WriteResponse(w, code, encodedErrorResponse, MimeXML)
return code
} }
// If none of the http routes match respond with appropriate errors. // If none of the http routes match respond with appropriate errors.

12
api/router.go
View file

@ -154,16 +154,8 @@ func logErrorResponse(l *zap.Logger) mux.MiddlewareFunc {
// pass execution: // pass execution:
h.ServeHTTP(lw, r) h.ServeHTTP(lw, r)
// Ignore <300 status codes // Ignore >400 status codes
if lw.statusCode >= http.StatusMultipleChoices { if lw.statusCode >= http.StatusBadRequest {
l.Error("something went wrong",
zap.Int("status", lw.statusCode),
zap.String("request_id", GetRequestID(r.Context())),
zap.String("method", mux.CurrentRoute(r).GetName()),
zap.String("bucket", reqInfo.BucketName),
zap.String("object", reqInfo.ObjectName),
zap.String("description", http.StatusText(lw.statusCode)))
return return
} }