Merge pull request #935 from matrix-org/erikj/backfill_notifs

Don't notify pusher pool for backfilled events
pull/937/head
Erik Johnston 2016-07-20 13:39:16 +01:00 committed by GitHub
commit aba0b2a39b
1 changed files with 6 additions and 5 deletions

View File

@ -1118,11 +1118,12 @@ class FederationHandler(BaseHandler):
backfilled=backfilled,
)
# 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
)
if not backfilled:
# 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))