summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-30 13:11:05 +0000
committerGitHub <noreply@github.com>2019-01-30 13:11:05 +0000
commit43c6fca960fc462a9f1d499cf173795e2c835efb (patch)
treeac005d47e9a690694c54cc9fbed0ba5f7cea5131 /synapse
parentMerge pull request #4521 from matrix-org/rav/fed_routing/cleanups (diff)
parentRaise ConfigError instead (diff)
downloadsynapse-43c6fca960fc462a9f1d499cf173795e2c835efb.tar.xz
Merge pull request #4524 from matrix-org/erikj/fix_no_tls
Fix bug where synapse fails to start if no_tls set
Diffstat (limited to 'synapse')
-rwxr-xr-xsynapse/app/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 019b91576f..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"]: