diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-10 17:21:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-10 17:21:41 +0000 |
| commit | edd6cdfc9a1cf180871657baaf2aa6da5845f25a (patch) | |
| tree | 012ad4e8f710ea4a8314cbe2361ed5e59396c398 /synapse/config | |
| parent | Remove spurious for..else.. (diff) | |
| download | synapse-edd6cdfc9a1cf180871657baaf2aa6da5845f25a.tar.xz | |
Restore default bind address
Diffstat (limited to '')
| -rw-r--r-- | synapse/config/server.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 5e6b2a68a7..59687ee395 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -42,6 +42,15 @@ class ServerConfig(Config): self.listeners = config.get("listeners", []) + for listener in self.listeners: + bind_address = listener.get("bind_address", None) + bind_addresses = listener.setdefault("bind_addresses", []) + + if bind_address: + bind_addresses.append(bind_address) + elif not bind_addresses: + bind_addresses.append('') + self.gc_thresholds = read_gc_thresholds(config.get("gc_thresholds", None)) bind_port = config.get("bind_port") @@ -54,7 +63,7 @@ class ServerConfig(Config): self.listeners.append({ "port": bind_port, - "bind_address": bind_host, + "bind_addresses": [bind_host], "tls": True, "type": "http", "resources": [ @@ -73,7 +82,7 @@ class ServerConfig(Config): if unsecure_port: self.listeners.append({ "port": unsecure_port, - "bind_address": bind_host, + "bind_addresses": [bind_host], "tls": False, "type": "http", "resources": [ @@ -92,7 +101,7 @@ class ServerConfig(Config): if manhole: self.listeners.append({ "port": manhole, - "bind_address": "127.0.0.1", + "bind_addresses": ["127.0.0.1"], "type": "manhole", }) @@ -100,7 +109,7 @@ class ServerConfig(Config): if metrics_port: self.listeners.append({ "port": metrics_port, - "bind_address": config.get("metrics_bind_host", "127.0.0.1"), + "bind_addresses": [config.get("metrics_bind_host", "127.0.0.1")], "tls": False, "type": "http", "resources": [ |