Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 20:54:54 -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

4
synapse/util/async.py
View file

@ -19,7 +19,7 @@ from twisted.internet.defer import CancelledError
from twisted.python import failure
from .logcontext import (
PreserveLoggingContext, make_deferred_yieldable, preserve_fn
PreserveLoggingContext, make_deferred_yieldable, run_in_background
)
from synapse.util import logcontext, unwrapFirstError
@ -165,7 +165,7 @@ def concurrently_execute(func, args, limit):
pass
return logcontext.make_deferred_yieldable(defer.gatherResults([
preserve_fn(_concurrently_execute_inner)()
run_in_background(_concurrently_execute_inner)
for _ in range(limit)
], consumeErrors=True)).addErrback(unwrapFirstError)