diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-04-11 12:58:55 +0100 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2016-04-11 12:58:55 +0100 |
| commit | 2547dffccc2f2ead7e0d35dafd6da5d468e6d1d8 (patch) | |
| tree | 76c9b510bdb25556553c0cbfa7072e36d11f7e75 /synapse/handlers/federation.py | |
| parent | PEP8 (diff) | |
| parent | Run unsafe proces in a loop until we've caught up (diff) | |
| download | synapse-2547dffccc2f2ead7e0d35dafd6da5d468e6d1d8.tar.xz | |
Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions
Change pushers to use the event_actions table
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index c28226f840..83dab32bcb 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -26,7 +26,7 @@ from synapse.api.errors import ( from synapse.api.constants import EventTypes, Membership, RejectedReason from synapse.events.validator import EventValidator from synapse.util import unwrapFirstError -from synapse.util.logcontext import PreserveLoggingContext +from synapse.util.logcontext import PreserveLoggingContext, preserve_fn from synapse.util.logutils import log_function from synapse.util.async import run_on_reactor from synapse.util.frozenutils import unfreeze @@ -1094,6 +1094,12 @@ class FederationHandler(BaseHandler): context=context, ) + # 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)( + event_stream_id, max_stream_id + ) + defer.returnValue((context, event_stream_id, max_stream_id)) @defer.inlineCallbacks |