diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-19 11:05:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 11:05:57 +0100 |
| commit | 2de3d994f35e1055fc24d50b7d121b0e28cb8b59 (patch) | |
| tree | 7e0d66b0c984fb922919d8a6ce5b5470f043428c | |
| parent | 0.33.0rc1 changelog (diff) | |
| parent | changelog (diff) | |
| download | synapse-2de3d994f35e1055fc24d50b7d121b0e28cb8b59.tar.xz | |
Merge pull request #3561 from matrix-org/rav/disable_logcontext_warning
Disable logcontext warning
| -rw-r--r-- | changelog.d/3561.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/_base.py | 7 |
2 files changed, 5 insertions, 3 deletions
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 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() |