summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-20 16:24:00 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-20 16:24:00 +0000
commit32090aee169aafc9da4efa176b50a5fc8ede68d2 (patch)
treec7606c2aecdce27c83e0e2dc95393a95761c7934 /synapse/storage/_base.py
parentMerge branch 'master' into develop (diff)
downloadsynapse-32090aee169aafc9da4efa176b50a5fc8ede68d2.tar.xz
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py

index 5d4be09a82..2c04a1c5be 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -115,7 +115,6 @@ class SQLBaseStore(object): "[TXN END] {%s} %f", name, end - start ) - with PreserveLoggingContext(): result = yield self._db_pool.runInteraction( inner_func, *args, **kwargs