summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-22 14:51:22 +0100
committerErik Johnston <erik@matrix.org>2015-05-22 14:51:22 +0100
commit1ce1509989ae5eba67acbe0824d82177ab10917f (patch)
tree4e5e113b76e5fce9664e9be69e4238dc886cad60
parentUpdate log line (diff)
downloadsynapse-1ce1509989ae5eba67acbe0824d82177ab10917f.tar.xz
s/metric_interface/metric_bind_host/
-rwxr-xr-xsynapse/app/homeserver.py4
-rw-r--r--synapse/config/metrics.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index b887562f93..f3513abb55 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -277,11 +277,11 @@ class SynapseHomeServer(HomeServer):
                     config,
                     metrics_resource,
                 ),
-                interface=config.metrics_interface,
+                interface=config.metrics_bind_host,
             )
             logger.info(
                 "Metrics now running on %s port %d",
-                config.metrics_interface, config.metrics_port,
+                config.metrics_bind_host, config.metrics_port,
             )
 
     def run_startup_checks(self, db_conn, database_engine):
diff --git a/synapse/config/metrics.py b/synapse/config/metrics.py
index c843c079cf..0cfb30ce7f 100644
--- a/synapse/config/metrics.py
+++ b/synapse/config/metrics.py
@@ -20,7 +20,7 @@ class MetricsConfig(Config):
     def read_config(self, config):
         self.enable_metrics = config["enable_metrics"]
         self.metrics_port = config.get("metrics_port")
-        self.metrics_interface = config.get("metrics_interface", "127.0.0.1")
+        self.metrics_bind_host = config.get("metrics_bind_host", "127.0.0.1")
 
     def default_config(self, config_dir_path, server_name):
         return """\
@@ -32,6 +32,6 @@ class MetricsConfig(Config):
         # Separate port to accept metrics requests on
         # metrics_port: 8081
 
-        # Which interface to bind the metric listener to
-        # metrics_interface: 127.0.0.1
+        # Which host to bind the metric listener to
+        # metrics_bind_host: 127.0.0.1
         """