diff options
| author | kaiyou <pierre@jaury.eu> | 2018-04-08 17:56:44 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-04-08 17:56:44 +0200 |
| commit | a13b7860c6570ad1bb9003e94ad67c761f0cf312 (patch) | |
| tree | d08b2c50d1c1a6e570c59396660cd83836aa9f14 /synapse/util/caches/expiringcache.py | |
| parent | Merge remote-tracking branch 'upstream/master' into feat-dockerfile (diff) | |
| parent | Update README.rst (diff) | |
| download | synapse-a13b7860c6570ad1bb9003e94ad67c761f0cf312.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
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: |