From 15a4ed03335e89922ef02b6e492169d2272f88a2 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sat, 7 Oct 2017 19:05:41 +0200 Subject: [PATCH] Fix timer never being stopped Even on a full request the timer needs to be stopped if it didn't stop yet --- .../matrix-org/dendrite/syncapi/sync/requestpool.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go b/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go index 3f3eacdef..bc5db42ed 100644 --- a/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go +++ b/src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go @@ -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 // 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. - if syncReq.timeout != 0 && syncReq.since != types.StreamPosition(0) && !syncReq.wantFullState { - timer.Stop() - } + timer.Stop() syncData, err := rp.currentSyncForUser(*syncReq, currentPos) var res util.JSONResponse if err != nil {