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

Actually return a response with timeout=0

Browse source
This commit is contained in:
Kegan Dougal 2022-05-18 19:22:54 +01:00
parent 30fc50d099
commit 0cb04005db
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
syncapi/sync/requestpool.go
View file

@ -381,6 +381,8 @@ 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
// do not loop again if the ?timeout= is 0 as that means "return immediately"
if syncReq.Timeout > 0 {
syncReq.Timeout = syncReq.Timeout - time.Since(startTime) syncReq.Timeout = syncReq.Timeout - time.Since(startTime)
if syncReq.Timeout < 0 { if syncReq.Timeout < 0 {
syncReq.Timeout = 0 syncReq.Timeout = 0
@ -388,6 +390,7 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
continue continue
} }
} }
}
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusOK, Code: http.StatusOK,