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

mediaapi/writers/download: Rename attempts to tries

Browse source 
Tries is more usual language in programming.
This commit is contained in:
Robert Swain 2017-05-11 09:16:20 +02:00
parent 304a275e1b
commit 563330b82a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@ var errRead = fmt.Errorf("failed to read response from remote server")
var errResponse = fmt.Errorf("failed to write file data to response body") var errResponse = fmt.Errorf("failed to write file data to response body")
var errWrite = fmt.Errorf("failed to write file to disk") var errWrite = fmt.Errorf("failed to write file to disk")
var nAttempts = 5 var nTries = 5
// Download implements /download // Download implements /download
// Files from this server (i.e. origin == cfg.ServerName) are served directly // Files from this server (i.e. origin == cfg.ServerName) are served directly
@ -129,7 +129,7 @@ func Download(w http.ResponseWriter, req *http.Request, origin types.ServerName,
mxcURL := "mxc://" + string(r.MediaMetadata.Origin) + "/" + string(r.MediaMetadata.MediaID) mxcURL := "mxc://" + string(r.MediaMetadata.Origin) + "/" + string(r.MediaMetadata.MediaID)
for attempts := 0; ; attempts++ { for tries := 0; ; tries++ {
activeRemoteRequests.Lock() activeRemoteRequests.Lock()
err = db.GetMediaMetadata(r.MediaMetadata.MediaID, r.MediaMetadata.Origin, r.MediaMetadata) err = db.GetMediaMetadata(r.MediaMetadata.MediaID, r.MediaMetadata.Origin, r.MediaMetadata)
if err == nil { if err == nil {
@ -139,7 +139,7 @@ func Download(w http.ResponseWriter, req *http.Request, origin types.ServerName,
return return
} }
if activeRemoteRequestCondition, ok := activeRemoteRequests.Set[mxcURL]; ok { if activeRemoteRequestCondition, ok := activeRemoteRequests.Set[mxcURL]; ok {
if attempts >= nAttempts { if tries >= nTries {
logger.Warnf("Other goroutines are trying to download the remote file and failing.") logger.Warnf("Other goroutines are trying to download the remote file and failing.")
jsonErrorResponse(w, util.JSONResponse{ jsonErrorResponse(w, util.JSONResponse{
Code: 500, Code: 500,