diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-14 11:36:23 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-14 11:36:23 +0100 |
| commit | 243c56e725920035b3847fb504cbbaf73428e0ca (patch) | |
| tree | 140dcae6cbc3c476e08032de7f3c4c6e5c324aea /synapse/handlers/federation.py | |
| parent | Merge branch 'develop' into notifier_unify (diff) | |
| parent | Specify python 2.7 in the virtualenv setup (SYN-319) #resolved (diff) | |
| download | synapse-243c56e725920035b3847fb504cbbaf73428e0ca.tar.xz | |
Merge branch 'develop' into notifier_unify
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
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()) |