diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-12 17:41:36 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-12 17:44:23 +0100 |
| commit | a005b7269a9c1df517f6a01e72c1eea5f4cb0354 (patch) | |
| tree | 598d255f02328f56fb9d0fc340cb2666d8b1354b /synapse/config/server.py | |
| parent | Fix tests (diff) | |
| download | synapse-a005b7269a9c1df517f6a01e72c1eea5f4cb0354.tar.xz | |
Add backwards compat support for metrics, manhole and webclient config options
Diffstat (limited to '')
| -rw-r--r-- | synapse/config/server.py | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 9dab167b21..95bc967d0e 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -20,7 +20,6 @@ class ServerConfig(Config): def read_config(self, config): self.server_name = config["server_name"] - self.manhole = config.get("manhole") self.pid_file = self.abspath(config.get("pid_file")) self.web_client = config["web_client"] self.soft_file_limit = config["soft_file_limit"] @@ -35,6 +34,8 @@ class ServerConfig(Config): bind_host = config.get("bind_host", "") gzip_responses = config.get("gzip_responses", True) + names = ["client", "webclient"] if self.web_client else ["client"] + self.listeners.append({ "port": bind_port, "bind_address": bind_host, @@ -42,7 +43,7 @@ class ServerConfig(Config): "type": "http", "resources": [ { - "names": ["client", "webclient"], + "names": names, "compress": gzip_responses, }, { @@ -61,7 +62,7 @@ class ServerConfig(Config): "type": "http", "resources": [ { - "names": ["client", "webclient"], + "names": names, "compress": gzip_responses, }, { @@ -71,6 +72,29 @@ class ServerConfig(Config): ] }) + manhole = config.get("manhole") + if manhole: + self.listeners.append({ + "port": manhole, + "bind_address": "127.0.0.1", + "type": "manhole", + }) + + metrics_port = config.get("metrics_port") + if metrics_port: + self.listeners.append({ + "port": metrics_port, + "bind_address": config.get("metrics_bind_host", "127.0.0.1"), + "tls": False, + "type": "http", + "resources": [ + { + "names": ["metrics"], + "compress": False, + }, + ] + }) + # Attempt to guess the content_addr for the v0 content repostitory content_addr = config.get("content_addr") if not content_addr: |