summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-03 15:10:04 +0100
committerGitHub <noreply@github.com>2018-05-03 15:10:04 +0100
commit966686c845723b08d30fe7399d281dae22f57db4 (patch)
tree8dd5ceabb4c8ecbae18fa95f10108ba335c6bbbf
parentMerge pull request #3183 from matrix-org/rav/moar_logcontext_leaks (diff)
parentMerge remote-tracking branch 'origin/develop' into rav/warn_on_logcontext_fail (diff)
downloadsynapse-966686c845723b08d30fe7399d281dae22f57db4.tar.xz
Merge pull request #3007 from matrix-org/rav/warn_on_logcontext_fail
Make 'unexpected logging context' into warnings
-rw-r--r--synapse/util/logcontext.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py
index e086e12213..eab9d57650 100644
--- a/synapse/util/logcontext.py
+++ b/synapse/util/logcontext.py
@@ -164,7 +164,7 @@ class LoggingContext(object):
         current = self.set_current_context(self.previous_context)
         if current is not self:
             if current is self.sentinel:
-                logger.debug("Expected logging context %s has been lost", self)
+                logger.warn("Expected logging context %s has been lost", self)
             else:
                 logger.warn(
                     "Current logging context %s is not expected context %s",
@@ -279,7 +279,7 @@ class PreserveLoggingContext(object):
         context = LoggingContext.set_current_context(self.current_context)
 
         if context != self.new_context:
-            logger.debug(
+            logger.warn(
                 "Unexpected logging context: %s is not %s",
                 context, self.new_context,
             )