diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
commit | cd581338cf2618d8480ce7ba6a2ffd4a5270b552 (patch) | |
tree | 533c0f5efcde3f06ea6e069c9d4ee8fb4f6ee231 /synapse/app/appservice.py | |
parent | Newsfile (diff) | |
parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
download | synapse-cd581338cf2618d8480ce7ba6a2ffd4a5270b552.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/app/appservice.py')
-rw-r--r-- | synapse/app/appservice.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/appservice.py b/synapse/app/appservice.py index 767b87d2db..02b900f382 100644 --- a/synapse/app/appservice.py +++ b/synapse/app/appservice.py @@ -94,7 +94,7 @@ class AppserviceServer(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!" @@ -103,7 +103,7 @@ class AppserviceServer(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) |