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

Lint

Browse source
This commit is contained in:
Neil Alexander 2020-08-25 14:33:01 +01:00
parent 3cc3b52f1c
commit 0de3a2157b
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mediaapi/routing/upload.go
View file

@ -155,9 +155,9 @@ func (r *uploadRequest) doUpload(
} }
if existingMetadata != nil { if existingMetadata != nil {
// The file already exists. Make a new media ID up for it. // The file already exists. Make a new media ID up for it.
mediaID, err := r.generateMediaID(ctx, db) mediaID, merr := r.generateMediaID(ctx, db)
if err != nil { if merr != nil {
r.Logger.WithError(err).Error("Failed to generate media ID for existing file") r.Logger.WithError(merr).Error("Failed to generate media ID for existing file")
resErr := jsonerror.InternalServerError() resErr := jsonerror.InternalServerError()
return &resErr return &resErr
} }