diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-30 12:48:09 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-30 12:48:09 +0000 |
| commit | e87d7a4b0f946ec6723138e48f4bd7aae8389a5d (patch) | |
| tree | ac005d47e9a690694c54cc9fbed0ba5f7cea5131 /synapse/app | |
| parent | Newsfile (diff) | |
| download | synapse-e87d7a4b0f946ec6723138e48f4bd7aae8389a5d.tar.xz | |
Raise ConfigError instead
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 4 |
1 files changed, 3 insertions, 1 deletions
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"]: |