mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 06:02:13 +00:00
Fix logcontext handling for concurrently_execute
Avoid preserve_context_over_deferred, which is broken.
This commit is contained in:
parent
3ddda939d3
commit
148428ce76
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user