Merge pull request #869 from matrix-org/erikj/backfill_fix

Correctly mark backfilled events as backfilled
pull/871/head
Erik Johnston 2016-06-15 11:21:31 +01:00 committed by GitHub
commit d9f7fa2e57
1 changed files with 16 additions and 14 deletions

View File

@ -345,6 +345,8 @@ class FederationHandler(BaseHandler):
)
missing_auth = required_auth - set(auth_events)
if missing_auth:
logger.info("Missing auth for backfill: %r", missing_auth)
results = yield defer.gatherResults(
[
self.replication_layer.get_pdu(
@ -399,7 +401,7 @@ class FederationHandler(BaseHandler):
# previous to work out the state.
# TODO: We can probably do something more clever here.
yield self._handle_new_event(
dest, event
dest, event, backfilled=True,
)
defer.returnValue(events)