summary refs log tree commit diff
path: root/synapse/storage/roommember.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-01-17 11:51:09 +0000
committerGitHub <noreply@github.com>2017-01-17 11:51:09 +0000
commitd11d7cdf875e524ce217ff3b091a07fb1c3b99ae (patch)
tree5f88266e2cc5c5ea5afe564d4488f65af3d227d1 /synapse/storage/roommember.py
parentMerge pull request #1810 from matrix-org/erikj/state_auth_splitout_split (diff)
parentTidy up test (diff)
downloadsynapse-d11d7cdf875e524ce217ff3b091a07fb1c3b99ae.tar.xz
Merge pull request #1815 from matrix-org/erikj/iter_cache_size
Optionally measure size of cache by sum of length of values
Diffstat (limited to 'synapse/storage/roommember.py')
-rw-r--r--synapse/storage/roommember.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 5d18037c7c..768e0a4451 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -390,7 +390,8 @@ class RoomMemberStore(SQLBaseStore):
             room_id, state_group, state_ids,
         )
 
-    @cachedInlineCallbacks(num_args=2, cache_context=True)
+    @cachedInlineCallbacks(num_args=2, cache_context=True, iterable=True,
+                           max_entries=100000)
     def _get_joined_users_from_context(self, room_id, state_group, current_state_ids,
                                        cache_context, event=None):
         # We don't use `state_group`, it's there so that we can cache based