Merge branch 'notifier_unify' into notifier_performance

This commit is contained in:
Mark Haines 2015-05-14 11:36:44 +01:00
commit 899d4675dd
4 changed files with 10 additions and 21 deletions

View file

@ -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())