diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 16:24:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 16:24:00 +0000 |
| commit | 32090aee169aafc9da4efa176b50a5fc8ede68d2 (patch) | |
| tree | c7606c2aecdce27c83e0e2dc95393a95761c7934 /synapse/storage | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-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')
| -rw-r--r-- | synapse/storage/_base.py | 1 | ||||
| -rw-r--r-- | synapse/storage/roommember.py | 4 |
2 files changed, 2 insertions, 3 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 diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 93329703a2..c37df59d45 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -177,8 +177,8 @@ class RoomMemberStore(SQLBaseStore): return self._get_members_query(clause, vals) def _get_members_query(self, where_clause, where_values): - return self._db_pool.runInteraction( - self._get_members_query_txn, + return self.runInteraction( + "get_members_query", self._get_members_query_txn, where_clause, where_values ) |