summary refs log tree commit diff
path: root/synapse/storage/data_stores
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-29 12:53:21 +0100
committerGitHub <noreply@github.com>2019-10-29 12:53:21 +0100
commit561133c3c5fe5789c340ccac395b830e12a3c2b9 (patch)
treef10f22ea8f939815590d11a44ee308411bccd401 /synapse/storage/data_stores
parentMerge branch 'release-v1.5.0' of github.com:matrix-org/synapse into develop (diff)
parentUpdate docstring (diff)
downloadsynapse-561133c3c5fe5789c340ccac395b830e12a3c2b9.tar.xz
Merge pull request #6263 from matrix-org/erikj/caches_return_deferreds
Quick fix to ensure cache descriptors always return deferreds
Diffstat (limited to 'synapse/storage/data_stores')
-rw-r--r--synapse/storage/data_stores/main/roommember.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/roommember.py b/synapse/storage/data_stores/main/roommember.py
index e47ab604dd..bc04bfd7d4 100644
--- a/synapse/storage/data_stores/main/roommember.py
+++ b/synapse/storage/data_stores/main/roommember.py
@@ -720,7 +720,7 @@ class RoomMemberWorkerStore(EventsWorkerStore):
         # See bulk_get_push_rules_for_room for how we work around this.
         assert state_group is not None
 
-        cache = self._get_joined_hosts_cache(room_id)
+        cache = yield self._get_joined_hosts_cache(room_id)
         joined_hosts = yield cache.get_destinations(state_entry)
 
         return joined_hosts