summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-08-17 16:21:49 +0100
committerGitHub <noreply@github.com>2018-08-17 16:21:49 +0100
commitc144252a8c93b34d9610e0b96940863a9b661604 (patch)
tree0b1946938804bd72bcd7e0083bee67999b2c9ba2 /synapse/app
parentIntegrate presence from hotfixes (#3694) (diff)
parentchangelog (diff)
downloadsynapse-c144252a8c93b34d9610e0b96940863a9b661604.tar.xz
Merge pull request #3710 from matrix-org/rav/logcontext_for_pusher_updates
Fix logcontexts for running pushers
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/pusher.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py

index 9295a51d5b..0089a7c64f 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py
@@ -162,11 +162,11 @@ class PusherReplicationHandler(ReplicationClientHandler): else: yield self.start_pusher(row.user_id, row.app_id, row.pushkey) elif stream_name == "events": - yield self.pusher_pool.on_new_notifications( + self.pusher_pool.on_new_notifications( token, token, ) elif stream_name == "receipts": - yield self.pusher_pool.on_new_receipts( + self.pusher_pool.on_new_receipts( token, token, set(row.room_id for row in rows) ) except Exception: