summary refs log tree commit diff
path: root/synapse/app/user_dir.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-08-17 16:22:07 +0100
committerGitHub <noreply@github.com>2018-08-17 16:22:07 +0100
commit3cef867cc1b6a1a5db031ad89064cea5553e632b (patch)
tree62ae11f342bc617a6c09dc2c9c3a509ac6d2edd2 /synapse/app/user_dir.py
parentMerge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates (diff)
parentchangelog (diff)
downloadsynapse-3cef867cc1b6a1a5db031ad89064cea5553e632b.tar.xz
Merge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands
Logcontexts for replication command handlers
Diffstat (limited to 'synapse/app/user_dir.py')
-rw-r--r--synapse/app/user_dir.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py
index cb78de8834..1388a42b59 100644
--- a/synapse/app/user_dir.py
+++ b/synapse/app/user_dir.py
@@ -169,8 +169,9 @@ class UserDirectoryReplicationHandler(ReplicationClientHandler):
         super(UserDirectoryReplicationHandler, self).__init__(hs.get_datastore())
         self.user_directory = hs.get_user_directory_handler()
 
+    @defer.inlineCallbacks
     def on_rdata(self, stream_name, token, rows):
-        super(UserDirectoryReplicationHandler, self).on_rdata(
+        yield super(UserDirectoryReplicationHandler, self).on_rdata(
             stream_name, token, rows
         )
         if stream_name == "current_state_deltas":