diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-19 11:27:27 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-19 11:27:27 +0000 |
| commit | 47e7963e50704a1a981b8c009f8403085be721a6 (patch) | |
| tree | 1a8b4930d67c314c21d40e8e48436a0b246476f1 /synapse/handlers/federation.py | |
| parent | Merge pull request #503 from matrix-org/daniel/nonghosts (diff) | |
| parent | Take a deepcopy of push rules before mutating them (diff) | |
| download | synapse-47e7963e50704a1a981b8c009f8403085be721a6.tar.xz | |
Merge pull request #502 from matrix-org/erikj/push_notif_perf
Unread notification performance.
Diffstat (limited to '')
| -rw-r--r-- | synapse/handlers/federation.py | 13 |
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): |