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/dictionary_cache.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/dictionary_cache.py')
| -rw-r--r-- | synapse/util/caches/dictionary_cache.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/util/caches/dictionary_cache.py b/synapse/util/caches/dictionary_cache.py index f92d80542b..b0ca1bb79d 100644 --- a/synapse/util/caches/dictionary_cache.py +++ b/synapse/util/caches/dictionary_cache.py @@ -15,7 +15,7 @@ from synapse.util.caches.lrucache import LruCache from collections import namedtuple -from . import caches_by_name, cache_counter +from . import register_cache import threading import logging @@ -43,7 +43,7 @@ class DictionaryCache(object): __slots__ = [] self.sentinel = Sentinel() - caches_by_name[name] = self.cache + self.metrics = register_cache(name, self.cache) def check_thread(self): expected_thread = self.thread @@ -58,7 +58,7 @@ class DictionaryCache(object): def get(self, key, dict_keys=None): entry = self.cache.get(key, self.sentinel) if entry is not self.sentinel: - cache_counter.inc_hits(self.name) + self.metrics.inc_hits() if dict_keys is None: return DictionaryEntry(entry.full, dict(entry.value)) @@ -69,7 +69,7 @@ class DictionaryCache(object): if k in entry.value }) - cache_counter.inc_misses(self.name) + self.metrics.inc_misses() return DictionaryEntry(False, {}) def invalidate(self, key): |