summary refs log tree commit diff
path: root/synapse/util/caches/__init__.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-31 22:38:21 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-10-31 22:38:21 -0400
commit6f4bc6d01d6eed5211021fd29ef152f96c03c357 (patch)
tree1f0a6e344096d8f40283be7c1e74be6eb45735ca /synapse/util/caches/__init__.py
parentrename get_devices_by_remote to get_device_updates_by_remote (diff)
parentMerge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify (diff)
downloadsynapse-6f4bc6d01d6eed5211021fd29ef152f96c03c357.tar.xz
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'synapse/util/caches/__init__.py')
-rw-r--r--synapse/util/caches/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/caches/__init__.py b/synapse/util/caches/__init__.py
index 43fd65d693..da5077b471 100644
--- a/synapse/util/caches/__init__.py
+++ b/synapse/util/caches/__init__.py
@@ -107,7 +107,7 @@ def register_cache(cache_type, cache_name, cache, collect_callback=None):
                 if collect_callback:
                     collect_callback()
             except Exception as e:
-                logger.warn("Error calculating metrics for %s: %s", cache_name, e)
+                logger.warning("Error calculating metrics for %s: %s", cache_name, e)
                 raise
 
             yield GaugeMetricFamily("__unused", "")