Merge pull request #693 from matrix-org/erikj/backfill_self

Don't backfill from self
This commit is contained in:
Erik Johnston 2016-04-05 13:04:36 +01:00
commit c2b429ab24

View File

@ -284,6 +284,9 @@ class FederationHandler(BaseHandler):
def backfill(self, dest, room_id, limit, extremities=[]): def backfill(self, dest, room_id, limit, extremities=[]):
""" Trigger a backfill request to `dest` for the given `room_id` """ Trigger a backfill request to `dest` for the given `room_id`
""" """
if dest == self.server_name:
raise SynapseError(400, "Can't backfill from self.")
if not extremities: if not extremities:
extremities = yield self.store.get_oldest_events_in_room(room_id) extremities = yield self.store.get_oldest_events_in_room(room_id)
@ -450,7 +453,7 @@ class FederationHandler(BaseHandler):
likely_domains = [ likely_domains = [
domain for domain, depth in curr_domains domain for domain, depth in curr_domains
if domain is not self.server_name if domain != self.server_name
] ]
@defer.inlineCallbacks @defer.inlineCallbacks