mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix logging

Browse source
This commit is contained in:
Till Faelligen 2023-05-23 18:06:47 +02:00
parent 1a178473c7
commit a0e256711d
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
federationapi/routing/join.go
View file

@ -162,13 +162,13 @@ func MakeJoin(
switch e := internalErr.(type) { switch e := internalErr.(type) {
case nil: case nil:
case spec.InternalServerError: case spec.InternalServerError:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr).Error("failed to handle make_join request")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,
JSON: spec.InternalServerError{}, JSON: spec.InternalServerError{},
} }
case spec.MatrixError: case spec.MatrixError:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr).Error("failed to handle make_join request")
code := http.StatusInternalServerError code := http.StatusInternalServerError
switch e.ErrCode { switch e.ErrCode {
case spec.ErrorForbidden: case spec.ErrorForbidden:
@ -186,13 +186,13 @@ func MakeJoin(
JSON: e, JSON: e,
} }
case spec.IncompatibleRoomVersionError: case spec.IncompatibleRoomVersionError:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr).Error("failed to handle make_join request")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: e, JSON: e,
} }
default: default:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr).Error("failed to handle make_join request")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: spec.Unknown("unknown error"), JSON: spec.Unknown("unknown error"),

6
federationapi/routing/leave.go
View file

@ -101,13 +101,13 @@ func MakeLeave(
switch e := internalErr.(type) { switch e := internalErr.(type) {
case nil: case nil:
case spec.InternalServerError: case spec.InternalServerError:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr).Error("failed to handle make_leave request")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusInternalServerError, Code: http.StatusInternalServerError,
JSON: spec.InternalServerError{}, JSON: spec.InternalServerError{},
} }
case spec.MatrixError: case spec.MatrixError:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr).Error("failed to handle make_leave request")
code := http.StatusInternalServerError code := http.StatusInternalServerError
switch e.ErrCode { switch e.ErrCode {
case spec.ErrorForbidden: case spec.ErrorForbidden:
@ -123,7 +123,7 @@ func MakeLeave(
JSON: e, JSON: e,
} }
default: default:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr).Error("failed to handle make_leave request")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: spec.Unknown("unknown error"), JSON: spec.Unknown("unknown error"),