Fix check for bind_address
The empty string is a valid setting for the bind_address option, so explicitly check for None here instead. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
This commit is contained in:
parent
09f15918be
commit
702c020e58
|
@ -87,7 +87,7 @@ class AppserviceServer(HomeServer):
|
||||||
|
|
||||||
root_resource = create_resource_tree(resources, Resource())
|
root_resource = create_resource_tree(resources, Resource())
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
@ -112,7 +112,7 @@ class AppserviceServer(HomeServer):
|
||||||
bind_address = listener.get("bind_address", None)
|
bind_address = listener.get("bind_address", None)
|
||||||
bind_addresses = listener.get("bind_addresses", [])
|
bind_addresses = listener.get("bind_addresses", [])
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
|
|
@ -110,7 +110,7 @@ class ClientReaderServer(HomeServer):
|
||||||
|
|
||||||
root_resource = create_resource_tree(resources, Resource())
|
root_resource = create_resource_tree(resources, Resource())
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
@ -135,7 +135,7 @@ class ClientReaderServer(HomeServer):
|
||||||
bind_address = listener.get("bind_address", None)
|
bind_address = listener.get("bind_address", None)
|
||||||
bind_addresses = listener.get("bind_addresses", [])
|
bind_addresses = listener.get("bind_addresses", [])
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
|
|
@ -101,7 +101,7 @@ class FederationReaderServer(HomeServer):
|
||||||
|
|
||||||
root_resource = create_resource_tree(resources, Resource())
|
root_resource = create_resource_tree(resources, Resource())
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
@ -126,7 +126,7 @@ class FederationReaderServer(HomeServer):
|
||||||
bind_address = listener.get("bind_address", None)
|
bind_address = listener.get("bind_address", None)
|
||||||
bind_addresses = listener.get("bind_addresses", [])
|
bind_addresses = listener.get("bind_addresses", [])
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
|
|
@ -93,7 +93,7 @@ class FederationSenderServer(HomeServer):
|
||||||
|
|
||||||
root_resource = create_resource_tree(resources, Resource())
|
root_resource = create_resource_tree(resources, Resource())
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
@ -118,7 +118,7 @@ class FederationSenderServer(HomeServer):
|
||||||
bind_address = listener.get("bind_address", None)
|
bind_address = listener.get("bind_address", None)
|
||||||
bind_addresses = listener.get("bind_addresses", [])
|
bind_addresses = listener.get("bind_addresses", [])
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
|
|
@ -175,7 +175,7 @@ class SynapseHomeServer(HomeServer):
|
||||||
|
|
||||||
root_resource = create_resource_tree(resources, root_resource)
|
root_resource = create_resource_tree(resources, root_resource)
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
if tls:
|
if tls:
|
||||||
|
@ -215,7 +215,7 @@ class SynapseHomeServer(HomeServer):
|
||||||
bind_address = listener.get("bind_address", None)
|
bind_address = listener.get("bind_address", None)
|
||||||
bind_addresses = listener.get("bind_addresses", [])
|
bind_addresses = listener.get("bind_addresses", [])
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
|
|
@ -107,7 +107,7 @@ class MediaRepositoryServer(HomeServer):
|
||||||
|
|
||||||
root_resource = create_resource_tree(resources, Resource())
|
root_resource = create_resource_tree(resources, Resource())
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
@ -132,7 +132,7 @@ class MediaRepositoryServer(HomeServer):
|
||||||
bind_address = listener.get("bind_address", None)
|
bind_address = listener.get("bind_address", None)
|
||||||
bind_addresses = listener.get("bind_addresses", [])
|
bind_addresses = listener.get("bind_addresses", [])
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
|
|
@ -132,7 +132,7 @@ class PusherServer(HomeServer):
|
||||||
|
|
||||||
root_resource = create_resource_tree(resources, Resource())
|
root_resource = create_resource_tree(resources, Resource())
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
@ -168,7 +168,7 @@ class PusherServer(HomeServer):
|
||||||
bind_address = listener.get("bind_address", None)
|
bind_address = listener.get("bind_address", None)
|
||||||
bind_addresses = listener.get("bind_addresses", [])
|
bind_addresses = listener.get("bind_addresses", [])
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
|
|
@ -312,7 +312,7 @@ class SynchrotronServer(HomeServer):
|
||||||
|
|
||||||
root_resource = create_resource_tree(resources, Resource())
|
root_resource = create_resource_tree(resources, Resource())
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
@ -337,7 +337,7 @@ class SynchrotronServer(HomeServer):
|
||||||
bind_address = listener.get("bind_address", None)
|
bind_address = listener.get("bind_address", None)
|
||||||
bind_addresses = listener.get("bind_addresses", [])
|
bind_addresses = listener.get("bind_addresses", [])
|
||||||
|
|
||||||
if bind_address:
|
if bind_address is not None:
|
||||||
bind_addresses.append(bind_address)
|
bind_addresses.append(bind_address)
|
||||||
|
|
||||||
for address in bind_addresses:
|
for address in bind_addresses:
|
||||||
|
|
Loading…
Reference in New Issue