Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Documentation

Browse Source
This commit is contained in:
Erik Johnston 2015-06-18 16:15:10 +01:00
parent 1f24c2e589
commit 73513ececc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/notifier.py
View File

@ -305,10 +305,13 @@ class Notifier(object):
result = None
if timeout:
listener = None
timer = self.clock.call_later(
timeout/1000., lambda: listener.deferred.cancel()
)
listener = None # Will be set to a _NotificationListener that
# we'll be waiting on. Allows us to cancel it.
def timed_out():
if listener:
listener.deferred.cancel()
timer = self.clock.call_later(timeout/1000., timed_out)
prev_token = from_token
while not result:
@ -319,6 +322,10 @@ class Notifier(object):
if result:
break
# Now we wait for the _NotifierUserStream to be told there
# is a new token.
# We need to supply the token we supplied to callback so
# that we don't miss any current_token updates.
prev_token = current_token
listener = user_stream.new_listener(prev_token)
yield listener.deferred