From 00bc9791379109690fb5e465adf0e0e8e76167aa Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 19 Jul 2018 10:51:15 +0100
Subject: Disable logcontext warning

Temporary workaround to #3518 while we release 0.33.0.
---
 synapse/storage/_base.py | 7 ++++---
 1 file 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()
-- 
cgit 1.4.1


From 18a2b2c0b402af89f818a50ca2f4f0c733f864e4 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 19 Jul 2018 10:54:39 +0100
Subject: changelog

---
 changelog.d/3561.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/3561.bugfix

diff --git a/changelog.d/3561.bugfix b/changelog.d/3561.bugfix
new file mode 100644
index 0000000000..9a197cd67f
--- /dev/null
+++ b/changelog.d/3561.bugfix
@@ -0,0 +1 @@
+Disable a noisy warning about logcontexts
-- 
cgit 1.4.1