diff options
author | Erik Johnston <erik@matrix.org> | 2017-07-06 18:11:49 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-07-06 18:11:49 +0100 |
commit | 1200f28d661747a019d2f33bd5623c7bc635c59e (patch) | |
tree | 2c050e75f879921964990695d59c876aa2f51fb9 /synapse/handlers/federation.py | |
parent | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse (diff) | |
parent | Bump version and changelog (diff) | |
download | synapse-1200f28d661747a019d2f33bd5623c7bc635c59e.tar.xz |
Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse v0.22.1
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 483cb8eac6..694b820d85 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -76,6 +76,7 @@ class FederationHandler(BaseHandler): self.keyring = hs.get_keyring() self.action_generator = hs.get_action_generator() self.is_mine_id = hs.is_mine_id + self.pusher_pool = hs.get_pusherpool() self.replication_layer.set_handler(self) @@ -1426,7 +1427,7 @@ class FederationHandler(BaseHandler): if not backfilled: # this intentionally does not yield: we don't care about the result # and don't need to wait for it. - preserve_fn(self.hs.get_pusherpool().on_new_notifications)( + preserve_fn(self.pusher_pool.on_new_notifications)( event_stream_id, max_stream_id ) |