summary refs log tree commit diff
path: root/synapse/app/media_repository.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-31 15:19:26 +0000
committerErik Johnston <erik@matrix.org>2019-10-31 15:19:26 +0000
commitcd581338cf2618d8480ce7ba6a2ffd4a5270b552 (patch)
tree533c0f5efcde3f06ea6e069c9d4ee8fb4f6ee231 /synapse/app/media_repository.py
parentNewsfile (diff)
parentMerge pull request #6294 from matrix-org/erikj/add_state_storage (diff)
downloadsynapse-cd581338cf2618d8480ce7ba6a2ffd4a5270b552.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/app/media_repository.py')
-rw-r--r--synapse/app/media_repository.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py
index 6bc7202f33..2c6dd3ef02 100644
--- a/synapse/app/media_repository.py
+++ b/synapse/app/media_repository.py
@@ -120,7 +120,7 @@ class MediaRepositoryServer(HomeServer):
                 )
             elif listener["type"] == "metrics":
                 if not self.get_config().enable_metrics:
-                    logger.warn(
+                    logger.warning(
                         (
                             "Metrics listener configured, but "
                             "enable_metrics is not True!"
@@ -129,7 +129,7 @@ class MediaRepositoryServer(HomeServer):
                 else:
                     _base.listen_metrics(listener["bind_addresses"], listener["port"])
             else:
-                logger.warn("Unrecognized listener type: %s", listener["type"])
+                logger.warning("Unrecognized listener type: %s", listener["type"])
 
         self.get_tcp_replication().start_replication(self)