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

Honour timeouts

Browse source
This commit is contained in:
Kegan Dougal 2022-05-18 18:49:20 +01:00
parent 07cb8b452a
commit 30fc50d099
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
syncapi/sync/requestpool.go
View file

@ -253,6 +253,7 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
// loop until we get some data // loop until we get some data
for { for {
startTime := time.Now()
currentPos := rp.Notifier.CurrentPosition() currentPos := rp.Notifier.CurrentPosition()
// if the since token matches the current positions, wait via the notifier // if the since token matches the current positions, wait via the notifier
@ -380,6 +381,10 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
// they weren't always doing, resulting in flakey tests. // they weren't always doing, resulting in flakey tests.
if !syncReq.Response.HasUpdates() { if !syncReq.Response.HasUpdates() {
syncReq.Since = currentPos syncReq.Since = currentPos
syncReq.Timeout = syncReq.Timeout - time.Since(startTime)
if syncReq.Timeout < 0 {
syncReq.Timeout = 0
}
continue continue
} }
} }