summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-09-26 12:57:01 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-09-26 12:57:01 +0100
commit8b8f8c7b3c6136ea777265fff8052afed2b7031e (patch)
tree8bcd312859bf4141b5e204f64033411a5a5e2a85 /synapse/config/server.py
parentMerge commit '1b23f991a' into release-v1.4.0 (diff)
downloadsynapse-8b8f8c7b3c6136ea777265fff8052afed2b7031e.tar.xz
Explicitly log when a homeserver does not have a trusted key server configured (#6090)
Diffstat (limited to '')
-rw-r--r--synapse/config/server.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 9d3f1b5bfc..5ad7ee911d 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -48,6 +48,13 @@ ROOM_COMPLEXITY_TOO_GREAT = (
     "to join this room."
 )
 
+METRICS_PORT_WARNING = """\
+The metrics_port configuration option is deprecated in Synapse 0.31 in favour of
+a listener. Please see
+https://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.md
+on how to configure the new listener.
+--------------------------------------------------------------------------------"""
+
 
 class ServerConfig(Config):
     def read_config(self, config, **kwargs):
@@ -341,14 +348,7 @@ class ServerConfig(Config):
 
         metrics_port = config.get("metrics_port")
         if metrics_port:
-            logger.warn(
-                (
-                    "The metrics_port configuration option is deprecated in Synapse 0.31 "
-                    "in favour of a listener. Please see "
-                    "http://github.com/matrix-org/synapse/blob/master/docs/metrics-howto.md"
-                    " on how to configure the new listener."
-                )
-            )
+            logger.warning(METRICS_PORT_WARNING)
 
             self.listeners.append(
                 {