Merge pull request #420 from matrix-org/markjh/resource_usage

Track the cpu used in the main thread by each logging context

1 files changed, 1 insertions, 2 deletions

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

index f6a5a841a4..b2bee7958f 100644
--- a/synapse/util/debug.py
+++ b/synapse/util/debug.py
@@ -30,8 +30,7 @@ def debug_deferreds():
         context = LoggingContext.current_context()
 
         def restore_context_callback(x):
-            with PreserveLoggingContext():
-                LoggingContext.thread_local.current_context = context
+            with PreserveLoggingContext(context):
                 return fn(x)
 
         return restore_context_callback