diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-25 11:56:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-25 11:56:00 +0100 |
commit | cee1ae1b72bcbf5d173ca2f5eef5e947cc5e69f7 (patch) | |
tree | ce6789d45874397255e53623f665bb5ad7264d6f /synapse/storage/_base.py | |
parent | Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_error (diff) | |
parent | Fix another logcontext leak in _persist_events (diff) | |
download | synapse-cee1ae1b72bcbf5d173ca2f5eef5e947cc5e69f7.tar.xz |
Merge pull request #3606 from matrix-org/rav/logcontext_fixes_once_more
Fix another logcontext leak in _persist_events
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r-- | synapse/storage/_base.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 1d41d8d445..44f37b4c1e 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -311,6 +311,12 @@ class SQLBaseStore(object): after_callbacks = [] exception_callbacks = [] + if LoggingContext.current_context() == LoggingContext.sentinel: + logger.warn( + "Starting db txn '%s' from sentinel context", + desc, + ) + try: result = yield self.runWithConnection( self._new_transaction, |