summary refs log tree commit diff
path: root/synapse/util/logcontext.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-19 16:37:43 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-19 16:37:43 +0000
commit97c7c34f6f71238dcb364374733c1f2200d6b982 (patch)
tree944a2d841a5eae9fac1baff9fc5e0c504a3f7cb0 /synapse/util/logcontext.py
parentSYN-141: Encode query params as UTF-8. (diff)
downloadsynapse-97c7c34f6f71238dcb364374733c1f2200d6b982.tar.xz
Preserve logging context in a few more places, drop the logging context after it has been stashed to reduce potential for confusion
Diffstat (limited to '')
-rw-r--r--synapse/util/logcontext.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py
index 13176b05ce..2f430a0f19 100644
--- a/synapse/util/logcontext.py
+++ b/synapse/util/logcontext.py
@@ -18,6 +18,9 @@ class LoggingContext(object):
 
         __slots__ = []
 
+        def __str__(self):
+            return "sentinel"
+
         def copy_to(self, record):
             pass
 
@@ -102,6 +105,7 @@ class PreserveLoggingContext(object):
     def __enter__(self):
         """Captures the current logging context"""
         self.current_context = LoggingContext.current_context()
+        LoggingContext.thread_local.current_context = LoggingContext.sentinel
 
     def __exit__(self, type, value, traceback):
         """Restores the current logging context"""