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

Correctly clean up timer

Browse source
This commit is contained in:
Erik Johnston 2017-10-12 09:53:29 +01:00
parent 6c98aa7666
commit 59d99dcf3c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,13 +79,15 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *authtype
// Otherwise, we wait for the notifier to tell us if something *may* have // Otherwise, we wait for the notifier to tell us if something *may* have
// happened. We loop in case it turns out that nothing did happen. // happened. We loop in case it turns out that nothing did happen.
timeoutChan := time.After(syncReq.timeout) // case of timeout=0 is handled above timer := time.NewTimer(syncReq.timeout) // case of timeout=0 is handled above
defer timer.Stop()
for { for {
select { select {
// Wait for notifier to wake us up // Wait for notifier to wake us up
case currPos = <-rp.makeNotifyChannel(*syncReq, currPos): case currPos = <-rp.makeNotifyChannel(*syncReq, currPos):
// Or for timeout to expire // Or for timeout to expire
case <-timeoutChan: case <-timer.C:
return util.JSONResponse{ return util.JSONResponse{
Code: 200, Code: 200,
JSON: types.NewResponse(syncReq.since), JSON: types.NewResponse(syncReq.since),