Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-06-19 19:44:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

defer.returnValue must not be called within Measure

Browse source
This commit is contained in:
Erik Johnston 2016-08-19 18:06:31 +01:00
parent 37adde32dc
commit afbf6b33fc
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/notifier.py
View file

@ -256,8 +256,7 @@ class Notifier(object):
"""Used to inform replication listeners that something has happend
without waking up any of the normal user event streams"""
with PreserveLoggingContext():
with Measure(self.clock, "on_new_replication_data"):
self.notify_replication()
self.notify_replication()
@defer.inlineCallbacks
def wait_for_events(self, user_id, timeout, callback, room_ids=None,