summary refs log tree commit diff
path: root/synapse/storage/roommember.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-06 13:35:28 +0100
committerErik Johnston <erik@matrix.org>2015-08-06 13:35:28 +0100
commit2efb93af529db0beecd4ff023c9d7f1cdadac0aa (patch)
tree41f592ee25114a50ae4b699e9d04136942161c3c /synapse/storage/roommember.py
parentMake @cached cache deferreds rather than the deferreds' values (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_key... (diff)
downloadsynapse-2efb93af529db0beecd4ff023c9d7f1cdadac0aa.tar.xz
Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds
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 4db07f6fb4..55dd3f6cfb 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -78,7 +78,7 @@ class RoomMemberStore(SQLBaseStore):
             lambda events: events[0] if events else None
         )
 
-    @cached()
+    @cached(max_entries=5000)
     def get_users_in_room(self, room_id):
         def f(txn):
 
@@ -154,7 +154,7 @@ class RoomMemberStore(SQLBaseStore):
             RoomsForUser(**r) for r in self.cursor_to_dict(txn)
         ]
 
-    @cached()
+    @cached(max_entries=5000)
     def get_joined_hosts_for_room(self, room_id):
         return self.runInteraction(
             "get_joined_hosts_for_room",