diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-25 10:47:57 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-25 10:53:23 +0100 |
| commit | 07defd5fe6cc6f645195ddf0d679290bb214ca73 (patch) | |
| tree | fd2d8d43cf9c87191381c81a89e2738c293edacf /synapse/storage/_base.py | |
| parent | Merge pull request #3597 from matrix-org/erikj/did_forget (diff) | |
| download | synapse-07defd5fe6cc6f645195ddf0d679290bb214ca73.tar.xz | |
Fix another logcontext leak in _persist_events
We need to run the errback in the sentinel context to avoid losing our own context. Also: add logging to runInteraction to help identify where "Starting db connection from sentinel context" warnings are coming from
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, |