diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-19 18:06:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-19 18:23:44 +0100 |
| commit | afbf6b33fc22896df1048d8d8e1f8c790411126b (patch) | |
| tree | f6f5244182b62d3fb543e258c1fe35826eb7431a /synapse/notifier.py | |
| parent | Move defer.returnValue out of Measure (diff) | |
| download | synapse-afbf6b33fc22896df1048d8d8e1f8c790411126b.tar.xz | |
defer.returnValue must not be called within Measure
Diffstat (limited to 'synapse/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index b1de293dbc..c48024096d 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -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, |