summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-10 17:23:18 +0000
committerErik Johnston <erik@matrix.org>2017-01-10 17:23:18 +0000
commitb1dfd202928174ca5b377196b813e6ce51fe0999 (patch)
tree485388337d8be82edcbd14bf4077d7dcd14ddc7e /synapse
parentRestore default bind address (diff)
downloadsynapse-b1dfd202928174ca5b377196b813e6ce51fe0999.tar.xz
Pop bind_address
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py

index 59687ee395..1f9999d57a 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -43,7 +43,7 @@ class ServerConfig(Config): self.listeners = config.get("listeners", []) for listener in self.listeners: - bind_address = listener.get("bind_address", None) + bind_address = listener.pop("bind_address", None) bind_addresses = listener.setdefault("bind_addresses", []) if bind_address: