diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-02-13 12:16:01 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-02-13 12:16:01 +0000 |
| commit | a9b712e9dce119c65fe24913d2a79212ae07a354 (patch) | |
| tree | 2c98b0b3d7d31c59ce41db257c3a18c5b3a2df03 /synapse/util/caches/expiringcache.py | |
| parent | Factor out common code for search insert (diff) | |
| parent | Merge pull request #2857 from matrix-org/erikj/upload_store (diff) | |
| download | synapse-a9b712e9dce119c65fe24913d2a79212ae07a354.tar.xz | |
Merge branch 'develop' into matthew/gin_work_mem
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: |