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

mediaapi/writers/download: Log warnings about why we return 404

Browse source
This commit is contained in:
Robert Swain 2017-05-18 08:57:29 +02:00
parent c43aa20adc
commit eddc3e0789
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
View file

@ -166,6 +166,7 @@ func Download(w http.ResponseWriter, req *http.Request, origin types.ServerName,
r.respondFromRemoteFile(w, cfg.BasePath, cfg.MaxFileSize, db, activeRemoteRequests)
} else {
// If we do not have a record and the origin is local, or if we have another error from the database, the file is not found
r.Logger.Warnln("Failed to look up file in database:", err)
r.jsonErrorResponse(w, util.JSONResponse{
Code: 404,
JSON: jsonerror.NotFound(fmt.Sprintf("File with media ID %q does not exist", r.MediaMetadata.MediaID)),
@ -187,6 +188,7 @@ func (r *downloadRequest) respondFromLocalFile(w http.ResponseWriter, basePath t
file, err := os.Open(filePath)
if err != nil {
// FIXME: Remove erroneous file from database?
r.Logger.Warnln("Failed to open file:", err)
r.jsonErrorResponse(w, util.JSONResponse{
Code: 404,
JSON: jsonerror.NotFound(fmt.Sprintf("File with media ID %q does not exist", r.MediaMetadata.MediaID)),
@ -197,6 +199,7 @@ func (r *downloadRequest) respondFromLocalFile(w http.ResponseWriter, basePath t
stat, err := file.Stat()
if err != nil {
// FIXME: Remove erroneous file from database?
r.Logger.Warnln("Failed to stat file:", err)
r.jsonErrorResponse(w, util.JSONResponse{
Code: 404,
JSON: jsonerror.NotFound(fmt.Sprintf("File with media ID %q does not exist", r.MediaMetadata.MediaID)),
@ -259,6 +262,7 @@ func (r *downloadRequest) createRemoteRequest() (*http.Response, *util.JSONRespo
if resp.StatusCode != 200 {
r.Logger.Printf("Server responded with %d\n", resp.StatusCode)
if resp.StatusCode == 404 {
r.Logger.Warnln("Remote server says file does not exist")
return nil, &util.JSONResponse{
Code: 404,
JSON: jsonerror.NotFound(fmt.Sprintf("File with media ID %q does not exist", r.MediaMetadata.MediaID)),