diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-24 09:53:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-24 09:53:57 +0100 |
commit | e0b9d5f0aff02681e0af59c9866d3ee74994bb2c (patch) | |
tree | e3f4d728e70f301ad0f989d35b463043f5ba06c6 /synapse/handlers/federation.py | |
parent | Merge pull request #4063 from matrix-org/erikj/cleaup_alias_creation (diff) | |
parent | Fix start_pushers vs _start_pushers confusion (diff) | |
download | synapse-e0b9d5f0aff02681e0af59c9866d3ee74994bb2c.tar.xz |
Merge pull request #4075 from matrix-org/rav/fix_pusher_logcontexts
Clean up the way logcontexts and threads work in the pushers
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index cab57a8849..63e495e3f8 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -2520,7 +2520,7 @@ class FederationHandler(BaseHandler): if not backfilled: # Never notify for backfilled events for event, _ in event_and_contexts: - self._notify_persisted_event(event, max_stream_id) + yield self._notify_persisted_event(event, max_stream_id) def _notify_persisted_event(self, event, max_stream_id): """Checks to see if notifier/pushers should be notified about the @@ -2553,7 +2553,7 @@ class FederationHandler(BaseHandler): extra_users=extra_users ) - self.pusher_pool.on_new_notifications( + return self.pusher_pool.on_new_notifications( event_stream_id, max_stream_id, ) |