diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-06-10 12:26:14 +0300 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-10 12:26:14 +0300 |
| commit | c96d882a02924a26f69c75cb988b06f3015d7578 (patch) | |
| tree | 4b2fd1bea90831955841dfb33753ac553c439104 /synapse/util/caches/descriptors.py | |
| parent | Merge branch 'develop' into matthew/filter_members (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-c96d882a02924a26f69c75cb988b06f3015d7578.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/util/caches/descriptors.py')
| -rw-r--r-- | synapse/util/caches/descriptors.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/caches/descriptors.py b/synapse/util/caches/descriptors.py index fc1874b65b..65a1042de1 100644 --- a/synapse/util/caches/descriptors.py +++ b/synapse/util/caches/descriptors.py @@ -17,7 +17,7 @@ import logging from synapse.util.async import ObservableDeferred from synapse.util import unwrapFirstError, logcontext -from synapse.util.caches import CACHE_SIZE_FACTOR +from synapse.util.caches import get_cache_factor_for from synapse.util.caches.lrucache import LruCache from synapse.util.caches.treecache import TreeCache, iterate_tree_cache_entry from synapse.util.stringutils import to_ascii @@ -313,7 +313,7 @@ class CacheDescriptor(_CacheDescriptorBase): orig, num_args=num_args, inlineCallbacks=inlineCallbacks, cache_context=cache_context) - max_entries = int(max_entries * CACHE_SIZE_FACTOR) + max_entries = int(max_entries * get_cache_factor_for(orig.__name__)) self.max_entries = max_entries self.tree = tree |