summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-14 11:36:44 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-14 11:36:44 +0100
commit899d4675dd44d63d03b92eb50b4382b7cbc4ce33 (patch)
tree813b38ef16b8fe62f82049108464eb3737d4d4dc /synapse/handlers/federation.py
parentFix v2 sync, update the last_notified_ms only if there was an active listener (diff)
parentMerge branch 'develop' into notifier_unify (diff)
downloadsynapse-899d4675dd44d63d03b92eb50b4382b7cbc4ce33.tar.xz
Merge branch 'notifier_unify' into notifier_performance
Diffstat (limited to 'synapse/handlers/federation.py')
-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 bc0f7b0ee7..d35d9f603c 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -315,6 +315,7 @@ class FederationHandler(BaseHandler):
 
         likely_domains = [
             domain for domain, depth in curr_domains
+            if domain is not self.server_name
         ]
 
         @defer.inlineCallbacks
@@ -364,6 +365,7 @@ class FederationHandler(BaseHandler):
         # from the time.
 
         tried_domains = set(likely_domains)
+        tried_domains.add(self.server_name)
 
         event_ids = list(extremities.keys())