diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-12 15:23:50 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-12 15:23:50 +0100 |
| commit | a6fb2aa2a5a5837d77bed8813f9e59bfe6be8999 (patch) | |
| tree | 154ff4598b9740104abd5cf465c98cf2797c5406 /synapse/util/async.py | |
| parent | Merge pull request #149 from matrix-org/erikj/backfill (diff) | |
| parent | Make distributer.fire work as it did (diff) | |
| download | synapse-a6fb2aa2a5a5837d77bed8813f9e59bfe6be8999.tar.xz | |
Merge pull request #144 from matrix-org/erikj/logging_context
Preserving logging contexts
Diffstat (limited to 'synapse/util/async.py')
| -rw-r--r-- | synapse/util/async.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py index d8febdb90c..f78395a431 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -16,15 +16,13 @@ from twisted.internet import defer, reactor -from .logcontext import PreserveLoggingContext +from .logcontext import preserve_context_over_deferred -@defer.inlineCallbacks def sleep(seconds): d = defer.Deferred() reactor.callLater(seconds, d.callback, seconds) - with PreserveLoggingContext(): - yield d + return preserve_context_over_deferred(d) def run_on_reactor(): |