summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-22 13:13:07 +0100
committerErik Johnston <erik@matrix.org>2015-05-22 13:13:07 +0100
commit59a0682f3e9fe64c7ab35c011b0af7b87ee54f71 (patch)
tree692fce4087f209787537bf70a51c2cfc29d75135
parentRevert register_new_matrix_user to use v1 api (diff)
downloadsynapse-59a0682f3e9fe64c7ab35c011b0af7b87ee54f71.tar.xz
Enable changing the interface the metrics listener binds to
Diffstat (limited to '')
-rwxr-xr-xsynapse/app/homeserver.py2
-rw-r--r--synapse/config/metrics.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index fa43211415..70a7be60b8 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -277,7 +277,7 @@ class SynapseHomeServer(HomeServer):
                     config,
                     metrics_resource,
                 ),
-                interface="127.0.0.1",
+                interface=config.metrics_interface,
             )
             logger.info("Metrics now running on 127.0.0.1 port %d", config.metrics_port)
 
diff --git a/synapse/config/metrics.py b/synapse/config/metrics.py
index 71a1b1d189..c843c079cf 100644
--- a/synapse/config/metrics.py
+++ b/synapse/config/metrics.py
@@ -20,6 +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")
 
     def default_config(self, config_dir_path, server_name):
         return """\
@@ -28,6 +29,9 @@ class MetricsConfig(Config):
         # Enable collection and rendering of performance metrics
         enable_metrics: False
 
-        # Separate port to accept metrics requests on (on localhost)
+        # Separate port to accept metrics requests on
         # metrics_port: 8081
+
+        # Which interface to bind the metric listener to
+        # metrics_interface: 127.0.0.1
         """