mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into neilalexander/pprof

Browse source
This commit is contained in:
Neil Alexander 2020-05-11 14:04:03 +01:00 committed by GitHub
parent 01dc5985ad 6e643860b1
commit 9eb19f329b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mediaapi/routing/download.go
View file

@ -118,7 +118,10 @@ func Download(
) )
if err != nil { if err != nil {
// TODO: Handle the fact we might have started writing the response // TODO: Handle the fact we might have started writing the response
dReq.jsonErrorResponse(w, util.ErrorResponse(err)) dReq.jsonErrorResponse(w, util.JSONResponse{
Code: http.StatusNotFound,
JSON: jsonerror.NotFound("Failed to download: " + err.Error()),
})
return return
} }
@ -138,7 +141,7 @@ func (r *downloadRequest) jsonErrorResponse(w http.ResponseWriter, res util.JSON
if err != nil { if err != nil {
r.Logger.WithError(err).Error("Failed to marshal JSONResponse") r.Logger.WithError(err).Error("Failed to marshal JSONResponse")
// this should never fail to be marshalled so drop err to the floor // this should never fail to be marshalled so drop err to the floor
res = util.MessageResponse(http.StatusInternalServerError, "Internal Server Error") res = util.MessageResponse(http.StatusNotFound, "Download request failed: "+err.Error())
resBytes, _ = json.Marshal(res.JSON) resBytes, _ = json.Marshal(res.JSON)
} }

1
sytest-whitelist
View file

@ -264,3 +264,4 @@ User can invite local user to room with version 5
remote user can join room with version 5 remote user can join room with version 5
User can invite remote user to room with version 5 User can invite remote user to room with version 5
Remote user can backfill in a room with version 5 Remote user can backfill in a room with version 5
Alternative server names do not cause a routing loop