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/app/synchrotron.py | |
parent | Remove spurious for..else.. (diff) | |
download | synapse-edd6cdfc9a1cf180871657baaf2aa6da5845f25a.tar.xz |
Restore default bind address
Diffstat (limited to 'synapse/app/synchrotron.py')
-rw-r--r-- | synapse/app/synchrotron.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 439daaa60a..4dfc2dc648 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -289,8 +289,7 @@ class SynchrotronServer(HomeServer): def _listen_http(self, listener_config): port = listener_config["port"] - bind_address = listener_config.get("bind_address", None) - bind_addresses = listener_config.get("bind_addresses", []) + bind_addresses = listener_config["bind_addresses"] site_tag = listener_config.get("tag", port) resources = {} for res in listener_config["resources"]: @@ -312,9 +311,6 @@ class SynchrotronServer(HomeServer): root_resource = create_resource_tree(resources, Resource()) - if bind_address is not None: - bind_addresses.append(bind_address) - for address in bind_addresses: reactor.listenTCP( port, @@ -334,11 +330,7 @@ class SynchrotronServer(HomeServer): if listener["type"] == "http": self._listen_http(listener) elif listener["type"] == "manhole": - bind_address = listener.get("bind_address", None) - bind_addresses = listener.get("bind_addresses", []) - - if bind_address is not None: - bind_addresses.append(bind_address) + bind_addresses = listener["bind_addresses"] for address in bind_addresses: reactor.listenTCP( |