OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync

pull/545/head
Erik Johnston 2016-02-01 09:34:17 +00:00
parent 25c311eaf6 d98a9f2583
commit b264b9548f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/notifier.py
View File

@ -363,7 +363,7 @@ class Notifier(object):
@defer.inlineCallbacks
def check_for_updates(before_token, after_token):
if not after_token.is_after(before_token):
defer.returnValue(EventStreamResult([], (before_token, before_token)))
defer.returnValue(EventStreamResult([], (from_token, from_token)))
events = []
end_token = from_token
@ -376,14 +376,11 @@ class Notifier(object):
continue
if only_keys and name not in only_keys:
continue
if limit:
new_limit = max(limit * 2, 10)
else:
new_limit = 10
new_events, new_key = yield source.get_new_events(
user=user,
from_key=getattr(from_token, keyname),
limit=new_limit,
limit=limit,
is_guest=is_peeking,
room_ids=room_ids,
)