summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-05-19 13:42:49 +0100
committerGitHub <noreply@github.com>2017-05-19 13:42:49 +0100
commit99713dc7d33a4f65e68e7a5b83c0b6cb346f41ac (patch)
tree7dcbb8503bcf13dc2e9b74a642b5a7701a3023a9 /synapse/handlers/federation.py
parentDon't push users who have left (diff)
parentMove invalidation cb to its own structure (diff)
downloadsynapse-99713dc7d33a4f65e68e7a5b83c0b6cb346f41ac.tar.xz
Merge pull request #2234 from matrix-org/erikj/fix_push
Store ActionGenerator in HomeServer
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 52d97dfbf3..63e633548d 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -43,7 +43,6 @@ from synapse.events.utils import prune_event
 
 from synapse.util.retryutils import NotRetryingDestination
 
-from synapse.push.action_generator import ActionGenerator
 from synapse.util.distributor import user_joined_room
 
 from twisted.internet import defer
@@ -75,6 +74,7 @@ class FederationHandler(BaseHandler):
         self.state_handler = hs.get_state_handler()
         self.server_name = hs.hostname
         self.keyring = hs.get_keyring()
+        self.action_generator = hs.get_action_generator()
 
         self.replication_layer.set_handler(self)
 
@@ -1389,8 +1389,7 @@ class FederationHandler(BaseHandler):
         )
 
         if not event.internal_metadata.is_outlier():
-            action_generator = ActionGenerator(self.hs)
-            yield action_generator.handle_push_actions_for_event(
+            yield self.action_generator.handle_push_actions_for_event(
                 event, context
             )