summary refs log tree commit diff
path: root/synapse/app/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-10 17:21:41 +0000
committerErik Johnston <erik@matrix.org>2017-01-10 17:21:41 +0000
commitedd6cdfc9a1cf180871657baaf2aa6da5845f25a (patch)
tree012ad4e8f710ea4a8314cbe2361ed5e59396c398 /synapse/app/appservice.py
parentRemove spurious for..else.. (diff)
downloadsynapse-edd6cdfc9a1cf180871657baaf2aa6da5845f25a.tar.xz
Restore default bind address
Diffstat (limited to 'synapse/app/appservice.py')
-rw-r--r--synapse/app/appservice.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/synapse/app/appservice.py b/synapse/app/appservice.py

index c1379fdd7d..1900930053 100644 --- a/synapse/app/appservice.py +++ b/synapse/app/appservice.py
@@ -76,8 +76,7 @@ class AppserviceServer(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"]: @@ -87,9 +86,6 @@ class AppserviceServer(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, @@ -109,11 +105,7 @@ class AppserviceServer(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(