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

Fix timer never being stopped

Browse source 
Even on a full request the timer needs to be stopped if it didn't stop yet
This commit is contained in:
Marcel 2017-10-07 19:05:41 +02:00 committed by GitHub
parent 653e7dc21f
commit 15a4ed0333
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
View file

@ -77,9 +77,7 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *authtype
// We stop the timer BEFORE calculating the response so the cpu work // We stop the timer BEFORE calculating the response so the cpu work
// done to calculate the response is not timed. This stops us from // done to calculate the response is not timed. This stops us from
// doing lots of work then timing out and sending back an empty response. // doing lots of work then timing out and sending back an empty response.
if syncReq.timeout != 0 && syncReq.since != types.StreamPosition(0) && !syncReq.wantFullState { timer.Stop()
timer.Stop()
}
syncData, err := rp.currentSyncForUser(*syncReq, currentPos) syncData, err := rp.currentSyncForUser(*syncReq, currentPos)
var res util.JSONResponse var res util.JSONResponse
if err != nil { if err != nil {