address review comments

matrix-org · Jun 16, 2020 · b876a82 · b876a82
1 parent e394a25
commit b876a82
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
@@ -518,7 +518,12 @@ class GenericWorkerServer(HomeServer):
     def _listen_http(self, listener_config: ListenerConfig):
         port = listener_config.port
         bind_addresses = listener_config.bind_addresses
-        site_tag = listener_config.http_options.tag or port
+
+        assert listener_config.http_options is not None
+
+        site_tag = listener_config.http_options.tag
+        if site_tag is None:
+            site_tag = port
         resources = {}
         for res in listener_config.http_options.resources:
             for name in res.names:

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
@@ -95,7 +95,9 @@ def _listener_http(self, config: HomeServerConfig, listener_config: ListenerConf
         port = listener_config.port
         bind_addresses = listener_config.bind_addresses
         tls = listener_config.tls
-        site_tag = listener_config.http_options.tag or port
+        site_tag = listener_config.http_options.tag
+        if site_tag is None:
+            site_tag = port
 
         resources = {}
         for res in listener_config.http_options.resources:

diff --git a/synapse/config/server.py b/synapse/config/server.py
@@ -57,14 +57,14 @@
 --------------------------------------------------------------------------------"""
 
 
-KNOWN_LISTENER_TYPES = [
+KNOWN_LISTENER_TYPES = {
     "http",
     "metrics",
     "manhole",
     "replication",
-]
+}
 
-KNOWN_RESOURCES = [
+KNOWN_RESOURCES = {
     "client",
     "consent",
     "federation",
@@ -75,7 +75,7 @@
     "replication",
     "static",
     "webclient",
-]
+}
 
 
 @attr.s(frozen=True)