summary refs log tree commit diff
path: root/synapse/storage/roommember.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/roommember.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/roommember.py')
-rw-r--r--synapse/storage/roommember.py4
1 files changed, 2 insertions, 2 deletions
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 )