From a99524f3831b3da25da5ddad905f33bfd3f2502e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 4 May 2021 14:29:26 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> --- synapse/app/generic_worker.py | 2 +- synapse/app/homeserver.py | 2 +- synapse/util/caches/__init__.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index d831f793b9..d463ca3d87 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -452,7 +452,7 @@ def start(config_options): config.server.update_user_directory = False synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts - synapse.util.caches.lrucache.TRACK_MEMORY_USAGE = config.caches.track_memory_usage + synapse.util.caches.TRACK_MEMORY_USAGE = config.caches.track_memory_usage hs = GenericWorkerServer( config.server_name, diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index fd7958cecd..11933c699f 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -339,7 +339,7 @@ def setup(config_options): sys.exit(0) events.USE_FROZEN_DICTS = config.use_frozen_dicts - synapse.util.caches.lrucache.TRACK_MEMORY_USAGE = config.caches.track_memory_usage + synapse.util.caches.TRACK_MEMORY_USAGE = config.caches.track_memory_usage hs = SynapseHomeServer( config.server_name, diff --git a/synapse/util/caches/__init__.py b/synapse/util/caches/__init__.py index fc97d956e9..bac10dc47a 100644 --- a/synapse/util/caches/__init__.py +++ b/synapse/util/caches/__init__.py @@ -38,8 +38,8 @@ cache_evicted = Gauge("synapse_util_caches_cache:evicted_size", "", ["name"]) cache_total = Gauge("synapse_util_caches_cache:total", "", ["name"]) cache_max_size = Gauge("synapse_util_caches_cache_max_size", "", ["name"]) cache_memory_usage = Gauge( - "synapse_util_caches_cache_memory_usage", - "Estimated size in bytes of the caches", + "synapse_util_caches_cache_size_bytes", + "Estimated memory usage of the caches", ["name"], )