diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-02-13 16:45:36 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-02-13 16:45:36 +0000 |
| commit | ddb6a79b68da119bd91659ab8046553a02a4066e (patch) | |
| tree | 3a92b5c0738163474765a9ce4f1b7894fed9efde /synapse/util/caches/expiringcache.py | |
| parent | move search reindex to schema 47 (diff) | |
| parent | Merge branch 'develop' into matthew/gin_work_mem (diff) | |
| download | synapse-ddb6a79b68da119bd91659ab8046553a02a4066e.tar.xz | |
Merge branch 'matthew/gin_work_mem' into matthew/hit_the_gin
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: |