diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-03-26 14:51:11 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-03-26 14:51:11 +0100 |
| commit | aa3587fdd111d01b3bd0a610dab6e102d79f230c (patch) | |
| tree | 1fad5548eab845afcb1fe5f0c5e26694b322d6d3 /synapse/util/caches/expiringcache.py | |
| parent | Merge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff) | |
| parent | version bump (diff) | |
| download | synapse-aa3587fdd111d01b3bd0a610dab6e102d79f230c.tar.xz | |
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.0
Diffstat (limited to 'synapse/util/caches/expiringcache.py')
| -rw-r--r-- | synapse/util/caches/expiringcache.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/util/caches/expiringcache.py b/synapse/util/caches/expiringcache.py index 6ad53a6390..0aa103eecb 100644 --- a/synapse/util/caches/expiringcache.py +++ b/synapse/util/caches/expiringcache.py @@ -79,7 +79,11 @@ class ExpiringCache(object): while self._max_len and len(self) > self._max_len: _key, value = self._cache.popitem(last=False) if self.iterable: - self._size_estimate -= len(value.value) + removed_len = len(value.value) + self.metrics.inc_evictions(removed_len) + self._size_estimate -= removed_len + else: + self.metrics.inc_evictions() def __getitem__(self, key): try: |