diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-24 13:52:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 13:52:41 +0100 |
| commit | d89f8683dc873c97fc8e046b2eec200a9be0230c (patch) | |
| tree | 19e005a8ff177a3d0d6ee6eae0ea5c03e775a047 /synapse/util/async.py | |
| parent | Merge pull request #1040 from matrix-org/erikj/pagination (diff) | |
| parent | Remove tracer (diff) | |
| download | synapse-d89f8683dc873c97fc8e046b2eec200a9be0230c.tar.xz | |
Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts
Preserve some logcontexts
Diffstat (limited to 'synapse/util/async.py')
| -rw-r--r-- | synapse/util/async.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py index c84b23ff46..347fb1e380 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -146,10 +146,10 @@ def concurrently_execute(func, args, limit): except StopIteration: pass - return defer.gatherResults([ + return preserve_context_over_deferred(defer.gatherResults([ preserve_fn(_concurrently_execute_inner)() for _ in xrange(limit) - ], consumeErrors=True).addErrback(unwrapFirstError) + ], consumeErrors=True)).addErrback(unwrapFirstError) class Linearizer(object): @@ -181,7 +181,8 @@ class Linearizer(object): self.key_to_defer[key] = new_defer if current_defer: - yield preserve_context_over_deferred(current_defer) + with PreserveLoggingContext(): + yield current_defer @contextmanager def _ctx_manager(): @@ -264,7 +265,7 @@ class ReadWriteLock(object): curr_readers.clear() self.key_to_current_writer[key] = new_defer - yield defer.gatherResults(to_wait_on) + yield preserve_context_over_deferred(defer.gatherResults(to_wait_on)) @contextmanager def _ctx_manager(): |