summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-06-22 15:18:51 +0100
committerGitHub <noreply@github.com>2018-06-22 15:18:51 +0100
commit200e11c5bfe0ec70a80885222316c3e302a7bbcb (patch)
tree5c2511c2fdd7283b6e6f3cb26f636b3cf44b735a /synapse
parentMerge pull request #3430 from matrix-org/rav/configurable_push_action_rotation (diff)
parentMake _get_joined_hosts_cache cache non-iterable (diff)
downloadsynapse-200e11c5bfe0ec70a80885222316c3e302a7bbcb.tar.xz
Merge pull request #3432 from matrix-org/rav/joined_hosts_cache_non_iterable
Make _get_joined_hosts_cache cache non-iterable
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/roommember.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 48a88f755e..829cc4a207 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -455,7 +455,7 @@ class RoomMemberWorkerStore(EventsWorkerStore):
 
         defer.returnValue(joined_hosts)
 
-    @cached(max_entries=10000, iterable=True)
+    @cached(max_entries=10000)
     def _get_joined_hosts_cache(self, room_id):
         return _JoinedHostsCache(self, room_id)