summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-12 12:04:19 +0100
committerErik Johnston <erik@matrix.org>2016-04-12 12:04:19 +0100
commit8be1a379093162f8f5b424d0cfd8a05524ea539d (patch)
treefe9b1a00d3376c4a47a9b0f873855767a65afaa8
parentDon't append to unused list (diff)
downloadsynapse-8be1a379093162f8f5b424d0cfd8a05524ea539d.tar.xz
More comments
-rw-r--r--synapse/handlers/federation.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index fe80568ea5..0c65a48322 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -280,6 +280,10 @@ class FederationHandler(BaseHandler): @defer.inlineCallbacks def backfill(self, dest, room_id, limit, extremities=[]): """ Trigger a backfill request to `dest` for the given `room_id` + + This will attempt to get more events from the remote. This may return + be successfull and still return no events if the other side has no new + events to offer. """ if dest == self.server_name: raise SynapseError(400, "Can't backfill from self.") @@ -474,6 +478,8 @@ class FederationHandler(BaseHandler): limit=100, extremities=[e for e in extremities.keys()] ) + # If this succeeded then we probably already have the + # appropriate stuff. defer.returnValue(True) except SynapseError as e: logger.info(