Merge pull request #13 from matrix-org/request_logging

Request logging

1 files changed, 5 insertions, 3 deletions

diff --git a/synapse/util/async.py b/synapse/util/async.py

index bf578f8bfb..1219d927db 100644
--- a/synapse/util/async.py
+++ b/synapse/util/async.py
@@ -16,15 +16,17 @@
 
 from twisted.internet import defer, reactor
 
+from .logcontext import PreserveLoggingContext
 
+@defer.inlineCallbacks
 def sleep(seconds):
     d = defer.Deferred()
     reactor.callLater(seconds, d.callback, seconds)
-    return d
-
+    with PreserveLoggingContext():
+        yield d
 
 def run_on_reactor():
     """ This will cause the rest of the function to be invoked upon the next
     iteration of the main loop
     """
-    return sleep(0)
\ No newline at end of file
+    return sleep(0)