summary refs log tree commit diff
path: root/synapse/util/caches/deferred_cache.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-01-07 10:35:04 +0000
committerErik Johnston <erik@matrix.org>2021-01-07 10:35:04 +0000
commit91fd180be1198416edb08505dab33fb7eb02dae9 (patch)
tree1b598ca4f6d3347935ac46ce27fd4913f2764646 /synapse/util/caches/deferred_cache.py
parentMerge branch 'release-v1.25.0' of github.com:matrix-org/synapse into matrix-o... (diff)
parentEmpty iterables should count towards cache usage. (#9028) (diff)
downloadsynapse-91fd180be1198416edb08505dab33fb7eb02dae9.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/util/caches/deferred_cache.py')
-rw-r--r--synapse/util/caches/deferred_cache.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/caches/deferred_cache.py b/synapse/util/caches/deferred_cache.py

index 601305487c..1adc92eb90 100644 --- a/synapse/util/caches/deferred_cache.py +++ b/synapse/util/caches/deferred_cache.py
@@ -105,7 +105,7 @@ class DeferredCache(Generic[KT, VT]): keylen=keylen, cache_name=name, cache_type=cache_type, - size_callback=(lambda d: len(d)) if iterable else None, + size_callback=(lambda d: len(d) or 1) if iterable else None, metrics_collection_callback=metrics_cb, apply_cache_factor_from_config=apply_cache_factor_from_config, ) # type: LruCache[KT, VT]