diff options
| author | Erik Johnston <erikj@jki.re> | 2017-01-13 13:02:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 13:02:59 +0000 |
| commit | 641ccdbb14be249c96f11c9d461c1429a6fc86a9 (patch) | |
| tree | 361c50b0a3319280b8a0bde50dc00f264db36e10 /synapse/app/client_reader.py | |
| parent | README.rst: fix formatting (diff) | |
| parent | Pop bind_address (diff) | |
| download | synapse-641ccdbb14be249c96f11c9d461c1429a6fc86a9.tar.xz | |
Merge pull request #1795 from matrix-org/erikj/port_defaults
Restore default bind address
Diffstat (limited to 'synapse/app/client_reader.py')
| -rw-r--r-- | synapse/app/client_reader.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index b5e1d659e6..4d081eccd1 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -90,8 +90,7 @@ class ClientReaderServer(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"]: @@ -110,9 +109,6 @@ class ClientReaderServer(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, @@ -132,11 +128,7 @@ class ClientReaderServer(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( |