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/handlers/federation.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/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index f38b393e4a..3dd107a285 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -2386,8 +2386,7 @@ class FederationHandler(BaseHandler): extra_users=extra_users ) - logcontext.run_in_background( - self.pusher_pool.on_new_notifications, + self.pusher_pool.on_new_notifications( event_stream_id, max_stream_id, ) |