OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Disable logcontext warning
release-v0.33.0
Richard van der Hoff 2018-07-19 11:05:57 +01:00 committed by GitHub
parent 21d3b87943 18a2b2c0b4
commit 2de3d994f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3561.bugfix Normal file
View File

@ -0,0 +1 @@
Disable a noisy warning about logcontexts

7
synapse/storage/_base.py
View File

@ -343,9 +343,10 @@ class SQLBaseStore(object):
""" """
parent_context = LoggingContext.current_context() parent_context = LoggingContext.current_context()
if parent_context == LoggingContext.sentinel: if parent_context == LoggingContext.sentinel:
logger.warn( # warning disabled for 0.33.0 release; proper fixes will land imminently.
"Running db txn from sentinel context: metrics will be lost", # logger.warn(
) # "Running db txn from sentinel context: metrics will be lost",
# )
parent_context = None parent_context = None
start_time = time.time() start_time = time.time()