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: Never return server errors to user but log them

Browse source
This commit is contained in:
Robert Swain 2017-05-18 09:04:36 +02:00
parent eddc3e0789
commit 8cf507f85f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/mediaapi/writers/upload.go
View file

@ -160,14 +160,14 @@ func Upload(req *http.Request, cfg *config.MediaAPI, db *storage.Database) util.
bytesWritten, err := io.Copy(writer, reader)
if err != nil {
logger.Infof("Failed to copy %q\n", err)
logger.Warnf("Failed to copy %q\n", err)
tmpDirErr := os.RemoveAll(string(tmpDir))
if tmpDirErr != nil {
logger.Warnf("Failed to remove tmpDir (%v): %q\n", tmpDir, tmpDirErr)
}
return util.JSONResponse{
Code: 400,
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload: %q", err)),
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload")),
}
}
@ -210,13 +210,14 @@ func Upload(req *http.Request, cfg *config.MediaAPI, db *storage.Database) util.
err = db.StoreMediaMetadata(r.MediaMetadata)
if err != nil {
logger.Warnf("Failed to store metadata: %q\n", err)
tmpDirErr := os.RemoveAll(string(tmpDir))
if tmpDirErr != nil {
logger.Warnf("Failed to remove tmpDir (%v): %q\n", tmpDir, tmpDirErr)
}
return util.JSONResponse{
Code: 400,
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload: %q", err)),
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload")),
}
}
@ -225,13 +226,14 @@ func Upload(req *http.Request, cfg *config.MediaAPI, db *storage.Database) util.
types.Path(getPathFromMediaMetadata(r.MediaMetadata, cfg.BasePath)),
)
if err != nil {
logger.Warnf("Failed to move file to final destination: %q\n", err)
tmpDirErr := os.RemoveAll(string(tmpDir))
if tmpDirErr != nil {
logger.Warnf("Failed to remove tmpDir (%v): %q\n", tmpDir, tmpDirErr)
}
return util.JSONResponse{
Code: 400,
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload: %q", err)),
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload")),
}
}

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

@ -62,7 +62,7 @@ func createTempFileWriter(basePath types.Path, logger *log.Entry) (*bufio.Writer
logger.Infof("Failed to create temp dir %q\n", err)
return nil, nil, "", &util.JSONResponse{
Code: 400,
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload: %q", err)),
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload")),
}
}
writer, tmpFile, err := createFileWriter(tmpDir, "content")
@ -70,7 +70,7 @@ func createTempFileWriter(basePath types.Path, logger *log.Entry) (*bufio.Writer
logger.Infof("Failed to create file writer %q\n", err)
return nil, nil, "", &util.JSONResponse{
Code: 400,
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload: %q", err)),
JSON: jsonerror.Unknown(fmt.Sprintf("Failed to upload")),
}
}
return writer, tmpFile, tmpDir, nil