Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't set a timer if there's already a result to return

This commit is contained in:
Mark Haines 2015-05-13 15:42:13 +01:00
parent df6db5c802
commit 9af432257d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
synapse/notifier.py
View File

@ -82,9 +82,10 @@ class _NotifierUserStream(object):
self.current_token = self.current_token.copy_and_replace( self.current_token = self.current_token.copy_and_replace(
stream_key, stream_id stream_key, stream_id
) )
for listener in self.listeners: listeners = self.listeners
self.listeners = set()
for listener in listeners:
listener.notify(self.current_token) listener.notify(self.current_token)
self.listeners.clear()
def remove(self, notifier): def remove(self, notifier):
""" Remove this listener from all the indexes in the Notifier """ Remove this listener from all the indexes in the Notifier
@ -202,7 +203,7 @@ class Notifier(object):
user_streams = room_user_streams.copy() user_streams = room_user_streams.copy()
for user in extra_users: for user in extra_users:
user_stream = self.user_to_user_stream.get(user) user_stream = self.user_to_user_stream.get(str(user))
if user_stream is not None: if user_stream is not None:
user_streams.add(user_stream) user_streams.add(user_stream)
@ -288,12 +289,18 @@ class Notifier(object):
timer = [None] timer = [None]
if result:
user_stream.listeners.discard(listener[0])
defer.returnValue(result)
return
if timeout: if timeout:
timed_out = [False] timed_out = [False]
def _timeout_listener(): def _timeout_listener():
timed_out[0] = True timed_out[0] = True
timer[0] = None timer[0] = None
user_stream.listeners.discard(listener[0])
listener[0].notify(from_token) listener[0].notify(from_token)
# We create multiple notification listeners so we have to manage # We create multiple notification listeners so we have to manage