summary refs log tree commit diff
path: root/synapse/app/_base.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-13 11:48:56 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-13 11:48:56 +0000
commite3a0300431e6f641297cb90e936cb2d35fb51850 (patch)
treec4b78f9dda62a438fc8965704628a94fe228c07a /synapse/app/_base.py
parentFixup changelog (diff)
downloadsynapse-e3a0300431e6f641297cb90e936cb2d35fb51850.tar.xz
Special-case the default bind_addresses for metrics listener
turns out it doesn't really support ipv6, so let's hack around that by only
listening on ipv4 by default.
Diffstat (limited to 'synapse/app/_base.py')
-rw-r--r--synapse/app/_base.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py
index 5b0ca312e2..1d2c3339ff 100644
--- a/synapse/app/_base.py
+++ b/synapse/app/_base.py
@@ -153,9 +153,8 @@ def listen_metrics(bind_addresses, port):
     from prometheus_client import start_http_server
 
     for host in bind_addresses:
-        reactor.callInThread(start_http_server, int(port),
-                             addr=host, registry=RegistryProxy)
-        logger.info("Metrics now reporting on %s:%d", host, port)
+        logger.info("Starting metrics listener on %s:%d", host, port)
+        start_http_server(port, addr=host, registry=RegistryProxy)
 
 
 def listen_tcp(bind_addresses, port, factory, reactor=reactor, backlog=50):