summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-19 11:12:33 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-19 11:12:33 +0100
commit1ffb7bec2090df16b66bb803a8540e5f20b1649d (patch)
tree8ffb1ee66a6a7008fb3cc8578f3ab1f3ed6c5af7 /synapse/storage/_base.py
parentMerge pull request #3556 from matrix-org/rav/background_processes (diff)
parentMerge pull request #3561 from matrix-org/rav/disable_logcontext_warning (diff)
downloadsynapse-1ffb7bec2090df16b66bb803a8540e5f20b1649d.tar.xz
Merge remote-tracking branch 'origin/release-v0.33.0' into develop
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 98dde77431..a6a0e6ec9f 100644
--- 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()