summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-12 16:19:42 +0100
committerErik Johnston <erik@matrix.org>2015-05-12 16:19:46 +0100
commit80fd2b574c9e56637e67b996289607185c590109 (patch)
tree8555290fc6c9a3baf99f103533c244f11004939b
parentYou need to call contextmanager (diff)
downloadsynapse-80fd2b574c9e56637e67b996289607185c590109.tar.xz
Don't talk to yourself when backfilling
-rw-r--r--synapse/handlers/federation.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 7d9906039e..880cbd77e7 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -314,6 +314,7 @@ class FederationHandler(BaseHandler):
 
         likely_domains = [
             domain for domain, depth in curr_domains
+            if domain is not self.server_name
         ]
 
         @defer.inlineCallbacks
@@ -363,6 +364,7 @@ class FederationHandler(BaseHandler):
         # from the time.
 
         tried_domains = set(likely_domains)
+        tried_domains.add(self.server_name)
 
         event_ids = list(extremities.keys())