Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history

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", "")