diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-06-03 12:14:18 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-06-03 12:14:18 +0100 |
| commit | 8d740132f499b2c232716533ea786dfffacc1ec8 (patch) | |
| tree | 5034a5aba0c6e604683080357ae6481803a4dea1 /synapse/util/caches/expiringcache.py | |
| parent | brand the email from header (diff) | |
| parent | Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-8d740132f499b2c232716533ea786dfffacc1ec8.tar.xz | |
Merge branch 'develop' into matthew/brand-from-header
Diffstat (limited to 'synapse/util/caches/expiringcache.py')
| -rw-r--r-- | synapse/util/caches/expiringcache.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/util/caches/expiringcache.py b/synapse/util/caches/expiringcache.py index 2b68c1ac93..080388958f 100644 --- a/synapse/util/caches/expiringcache.py +++ b/synapse/util/caches/expiringcache.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from synapse.util.caches import cache_counter, caches_by_name +from synapse.util.caches import register_cache import logging @@ -49,7 +49,7 @@ class ExpiringCache(object): self._cache = {} - caches_by_name[cache_name] = self._cache + self.metrics = register_cache(cache_name, self._cache) def start(self): if not self._expiry_ms: @@ -78,9 +78,9 @@ class ExpiringCache(object): def __getitem__(self, key): try: entry = self._cache[key] - cache_counter.inc_hits(self._cache_name) + self.metrics.inc_hits() except KeyError: - cache_counter.inc_misses(self._cache_name) + self.metrics.inc_misses() raise if self._reset_expiry_on_get: |