summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-18 14:11:43 +0000
committerErik Johnston <erik@matrix.org>2016-01-18 14:48:30 +0000
commit63485b30298f906efbdbe39311dd7503101e7602 (patch)
treeaa921f265a5bbe3ac6b93358b8f9ea2054904674 /synapse/handlers/federation.py
parentMake notifications go quicker (diff)
downloadsynapse-63485b30298f906efbdbe39311dd7503101e7602.tar.xz
Re-enable urnead notifications
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 26402ea9cd..4b94940e99 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -36,7 +36,7 @@ from synapse.events.utils import prune_event
 
 from synapse.util.retryutils import NotRetryingDestination
 
-# from synapse.push.action_generator import ActionGenerator
+from synapse.push.action_generator import ActionGenerator
 
 from twisted.internet import defer
 
@@ -244,12 +244,11 @@ class FederationHandler(BaseHandler):
                     user = UserID.from_string(event.state_key)
                     yield user_joined_room(self.distributor, user, event.room_id)
 
-        # Temporarily disable notifications due to performance concerns.
-        # if not backfilled and not event.internal_metadata.is_outlier():
-        #     action_generator = ActionGenerator(self.store)
-        #     yield action_generator.handle_push_actions_for_event(
-        #         event, self
-        #     )
+        if not backfilled and not event.internal_metadata.is_outlier():
+            action_generator = ActionGenerator(self.store)
+            yield action_generator.handle_push_actions_for_event(
+                event, self
+            )
 
     @defer.inlineCallbacks
     def _filter_events_for_server(self, server_name, room_id, events):