Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 04:14:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/release-v0.33.0' into develop

Browse source
This commit is contained in:
Richard van der Hoff 2018-07-19 11:12:33 +01:00
commit 1ffb7bec20
23 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
synapse/storage/_base.py
View file

@ -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()