diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-10-09 17:43:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 17:43:32 +0100 |
| commit | aa3fac805784689dd5f4fe1a54cc4c44585c7bee (patch) | |
| tree | b4f585e95eb9e929ae25ccaac5bb29c0c5bffff9 /synapse | |
| parent | Merge pull request #2506 from matrix-org/rav/unhandled_failure (diff) | |
| parent | Fix logcontext handling for concurrently_execute (diff) | |
| download | synapse-aa3fac805784689dd5f4fe1a54cc4c44585c7bee.tar.xz | |
Merge pull request #2507 from matrix-org/rav/execute_concurrently_log_contexts
Fix logcontext handling for concurrently_execute
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/util/async.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py index 1453faf0ef..bb252f75d7 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -19,7 +19,7 @@ from twisted.internet import defer, reactor from .logcontext import ( PreserveLoggingContext, preserve_fn, preserve_context_over_deferred, ) -from synapse.util import unwrapFirstError +from synapse.util import logcontext, unwrapFirstError from contextlib import contextmanager @@ -155,7 +155,7 @@ def concurrently_execute(func, args, limit): except StopIteration: pass - return preserve_context_over_deferred(defer.gatherResults([ + return logcontext.make_deferred_yieldable(defer.gatherResults([ preserve_fn(_concurrently_execute_inner)() for _ in xrange(limit) ], consumeErrors=True)).addErrback(unwrapFirstError) |