From 270f212a2a89712e78ff2ff4922c2f99285d65dc Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 30 Jan 2019 12:14:50 +0000 Subject: _listener_http should return a list --- synapse/app/homeserver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 019b91576f..d5f5ff9599 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -95,7 +95,7 @@ class SynapseHomeServer(HomeServer): site_tag = listener_config.get("tag", port) if tls and config.no_tls: - return + return [] resources = {} for res in listener_config["resources"]: -- cgit 1.4.1 From e87d7a4b0f946ec6723138e48f4bd7aae8389a5d Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 30 Jan 2019 12:48:09 +0000 Subject: Raise ConfigError instead --- synapse/app/homeserver.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index d5f5ff9599..250a17cef8 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -95,7 +95,9 @@ class SynapseHomeServer(HomeServer): site_tag = listener_config.get("tag", port) if tls and config.no_tls: - return [] + raise ConfigError( + "Listener on port %i has TLS enabled, but no_tls is set" % (port,), + ) resources = {} for res in listener_config["resources"]: -- cgit 1.4.1