diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-19 16:16:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-19 16:16:05 +0000 |
| commit | 40d9765123463c9b14080b1f39dd1d21cc0c36eb (patch) | |
| tree | 3d873a4aeb71913540fffc1bdebdf40a9ca47c4a /synapse/handlers | |
| parent | Handle glob -> regex errors (diff) | |
| parent | Use split rather than endswith (diff) | |
| download | synapse-40d9765123463c9b14080b1f39dd1d21cc0c36eb.tar.xz | |
Merge pull request #505 from matrix-org/erikj/push_fast
Push actions perf
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/_base.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index 2d1167296a..5c7617de44 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -266,7 +266,7 @@ class BaseHandler(object): event, context=context ) - action_generator = ActionGenerator(self.store) + action_generator = ActionGenerator(self.hs) yield action_generator.handle_push_actions_for_event( event, self ) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 4b94940e99..6c19d6ae8c 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -245,7 +245,7 @@ class FederationHandler(BaseHandler): yield user_joined_room(self.distributor, user, event.room_id) if not backfilled and not event.internal_metadata.is_outlier(): - action_generator = ActionGenerator(self.store) + action_generator = ActionGenerator(self.hs) yield action_generator.handle_push_actions_for_event( event, self ) |