1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-22 03:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't tightloop if currentPos is 0

Browse Source
This commit is contained in:
Kegan Dougal 2017-04-20 18:01:45 +01:00
parent cb5081b332
commit 2a264db85e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/syncserver/sync/requestpool.go
View File

@ -119,6 +119,8 @@ func (rp *RequestPool) waitForEvents(req syncRequest) types.StreamPosition {
} }
func (rp *RequestPool) currentSyncForUser(req syncRequest) (*types.Response, error) { func (rp *RequestPool) currentSyncForUser(req syncRequest) (*types.Response, error) {
currentPos := rp.waitForEvents(req)
if req.since == types.StreamPosition(0) { if req.since == types.StreamPosition(0) {
pos, data, err := rp.db.CompleteSync(req.userID, req.limit) pos, data, err := rp.db.CompleteSync(req.userID, req.limit)
if err != nil { if err != nil {
@ -135,8 +137,6 @@ func (rp *RequestPool) currentSyncForUser(req syncRequest) (*types.Response, err
return res, nil return res, nil
} }
currentPos := rp.waitForEvents(req)
// TODO: handle ignored users // TODO: handle ignored users
data, err := rp.db.IncrementalSync(req.userID, req.since, currentPos, req.limit) data, err := rp.db.IncrementalSync(req.userID, req.since, currentPos, req.limit)