Merge pull request #159 from matrix-org/erikj/metrics_interface_config

Enable changing the interface the metrics listener binds to
pull/163/head
Mark Haines 2015-05-22 16:09:33 +01:00
commit 052ac0c8d0
2 changed files with 10 additions and 3 deletions

View File

@ -277,9 +277,12 @@ class SynapseHomeServer(HomeServer):
config, config,
metrics_resource, metrics_resource,
), ),
interface="127.0.0.1", interface=config.metrics_bind_host,
)
logger.info(
"Metrics now running on %s port %d",
config.metrics_bind_host, config.metrics_port,
) )
logger.info("Metrics now running on 127.0.0.1 port %d", config.metrics_port)
def run_startup_checks(self, db_conn, database_engine): def run_startup_checks(self, db_conn, database_engine):
all_users_native = are_all_users_on_domain( all_users_native = are_all_users_on_domain(

View File

@ -20,6 +20,7 @@ class MetricsConfig(Config):
def read_config(self, config): def read_config(self, config):
self.enable_metrics = config["enable_metrics"] self.enable_metrics = config["enable_metrics"]
self.metrics_port = config.get("metrics_port") self.metrics_port = config.get("metrics_port")
self.metrics_bind_host = config.get("metrics_bind_host", "127.0.0.1")
def default_config(self, config_dir_path, server_name): def default_config(self, config_dir_path, server_name):
return """\ return """\
@ -28,6 +29,9 @@ class MetricsConfig(Config):
# Enable collection and rendering of performance metrics # Enable collection and rendering of performance metrics
enable_metrics: False enable_metrics: False
# Separate port to accept metrics requests on (on localhost) # Separate port to accept metrics requests on
# metrics_port: 8081 # metrics_port: 8081
# Which host to bind the metric listener to
# metrics_bind_host: 127.0.0.1
""" """