summary refs log tree commit diff
path: root/synapse/app/federation_reader.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-06-13 23:50:10 +1000
committerGitHub <noreply@github.com>2018-06-13 23:50:10 +1000
commit0fde1896cddd8eb60ea943975bdf72ec12b76ad6 (patch)
treefe9c360653583654c1280cebbc3c3a8330d5c870 /synapse/app/federation_reader.py
parentMerge pull request #3390 from turt2live/travis/appsvc-metrics (diff)
parentThe flag is named enable_metrics, not collect_metrics (diff)
downloadsynapse-0fde1896cddd8eb60ea943975bdf72ec12b76ad6.tar.xz
Merge pull request #3389 from turt2live/travis/name_metrics
Use the correct flag (enable_metrics) when warning about an incorrect metrics setup
Diffstat (limited to 'synapse/app/federation_reader.py')
-rw-r--r--synapse/app/federation_reader.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py
index 2a1995d0cd..b2415cc671 100644
--- a/synapse/app/federation_reader.py
+++ b/synapse/app/federation_reader.py
@@ -111,7 +111,7 @@ class FederationReaderServer(HomeServer):
             elif listener["type"] == "metrics":
                 if not self.get_config().enable_metrics:
                     logger.warn(("Metrics listener configured, but "
-                                 "collect_metrics is not enabled!"))
+                                 "enable_metrics is not True!"))
                 else:
                     _base.listen_metrics(listener["bind_addresses"],
                                          listener["port"])