Merge pull request #3561 from matrix-org/rav/disable_logcontext_warning

Disable logcontext warning
2018-07-19 11:05:57 +01:00 · 2018-07-19 11:05:57 +01:00 · 2de3d994f3
parent 21d3b87943 18a2b2c0b4
commit 2de3d994f3
2 changed files with 5 additions and 3 deletions
--- a/changelog.d/3561.bugfix
+++ b/changelog.d/3561.bugfix
@ -0,0 +1 @@
+Disable a noisy warning about logcontexts
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@ -343,9 +343,10 @@ class SQLBaseStore(object):
        """
        parent_context = LoggingContext.current_context()
        if parent_context == LoggingContext.sentinel:
-            logger.warn(
-                "Running db txn from sentinel context: metrics will be lost",
-            )
+            # warning disabled for 0.33.0 release; proper fixes will land imminently.
+            # logger.warn(
+            #    "Running db txn from sentinel context: metrics will be lost",
+            # )
            parent_context = None

        start_time = time.time()