diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-08-17 00:32:39 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-08-17 00:32:39 +0100 |
| commit | 66f7dc8c87a6c585b4d456c5b2c4999452fc82c2 (patch) | |
| tree | 297396fd9fd5bd2ad08442f9e8a6f0240ebcafae /synapse/app/pusher.py | |
| parent | Merge pull request #3705 from matrix-org/erikj/fix_inbound_fed_worker (diff) | |
| download | synapse-66f7dc8c87a6c585b4d456c5b2c4999452fc82c2.tar.xz | |
Fix logcontexts for running pushers
First of all, avoid resetting the logcontext before running the pushers, to fix the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning. Instead, give them their own "background process" logcontexts.
Diffstat (limited to 'synapse/app/pusher.py')
| -rw-r--r-- | synapse/app/pusher.py | 4 |
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: |