Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 03:54:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into py3-xrange-1

Browse source
This commit is contained in:
Richard van der Hoff 2018-04-30 01:02:25 +01:00 • committed by GitHub
commit db75c86e84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 161 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

5
synapse/federation/federation_client.py
View file

@ -35,7 +35,7 @@ from synapse.federation.federation_base import (
import synapse.metrics
from synapse.util import logcontext, unwrapFirstError
from synapse.util.caches.expiringcache import ExpiringCache
from synapse.util.logcontext import make_deferred_yieldable, preserve_fn
from synapse.util.logcontext import make_deferred_yieldable, run_in_background
from synapse.util.logutils import log_function
from synapse.util.retryutils import NotRetryingDestination
@ -419,7 +419,8 @@ class FederationClient(FederationBase):
batch = set(missing_events[i:i + batch_size])
deferreds = [
preserve_fn(self.get_pdu)(
run_in_background(
self.get_pdu,
destinations=random_server_list(),
event_id=e_id,
)