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

Don't bother proxying lookups on _NotificationListener to underlying deferred

This commit is contained in:
Erik Johnston 2015-06-18 16:09:53 +01:00
parent 22049ea700
commit 1f24c2e589
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/notifier.py
View File

@ -48,13 +48,7 @@ class _NotificationListener(object):
__slots__ = ["deferred"] __slots__ = ["deferred"]
def __init__(self, deferred): def __init__(self, deferred):
object.__setattr__(self, "deferred", deferred) self.deferred = deferred
def __getattr__(self, name):
return getattr(self.deferred, name)
def __setattr__(self, name, value):
setattr(self.deferred, name, value)
class _NotifierUserStream(object): class _NotifierUserStream(object):
@ -313,14 +307,12 @@ class Notifier(object):
if timeout: if timeout:
listener = None listener = None
timer = self.clock.call_later( timer = self.clock.call_later(
timeout/1000., lambda: listener.cancel() timeout/1000., lambda: listener.deferred.cancel()
) )
prev_token = from_token prev_token = from_token
while not result: while not result:
try: try:
# We need to start listening to the streams *before* doing
# the callback, as otherwise we may miss something.
current_token = user_stream.current_token current_token = user_stream.current_token
result = yield callback(prev_token, current_token) result = yield callback(prev_token, current_token)