summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-19 11:14:20 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-19 11:14:20 +0100
commitf1a15ea20692e9f4b347cdddf6d714912356ba64 (patch)
treee012d519a01c04d43632d208b14560096d275566
parentMerge remote-tracking branch 'origin/release-v0.33.0' into develop (diff)
downloadsynapse-f1a15ea20692e9f4b347cdddf6d714912356ba64.tar.xz
revert 00bc979
... we've fixed the things that caused the warnings, so we should reinstate the
warning.
-rw-r--r--synapse/storage/_base.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index a6a0e6ec9f..1d41d8d445 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -343,10 +343,9 @@ class SQLBaseStore(object):
         """
         parent_context = LoggingContext.current_context()
         if parent_context == LoggingContext.sentinel:
-            # warning disabled for 0.33.0 release; proper fixes will land imminently.
-            # logger.warn(
-            #    "Running db txn from sentinel context: metrics will be lost",
-            # )
+            logger.warn(
+                "Starting db connection from sentinel context: metrics will be lost",
+            )
             parent_context = None
 
         start_time = time.time()