summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-20 11:45:29 +0000
committerErik Johnston <erik@matrix.org>2017-01-20 11:45:29 +0000
commit97efe99ae964e8f4e866d961282257e6f4293fd8 (patch)
tree86ccff2c5927b09f715e912a5791cc20b7d74e11 /synapse/config
parentMerge pull request #1828 from matrix-org/erikj/iterable_cache_size (diff)
downloadsynapse-97efe99ae964e8f4e866d961282257e6f4293fd8.tar.xz
Make worker listener config backwards compat
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/workers.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/synapse/config/workers.py b/synapse/config/workers.py
index 904789d155..b165c67ee7 100644
--- a/synapse/config/workers.py
+++ b/synapse/config/workers.py
@@ -29,3 +29,13 @@ class WorkerConfig(Config):
         self.worker_log_file = config.get("worker_log_file")
         self.worker_log_config = config.get("worker_log_config")
         self.worker_replication_url = config.get("worker_replication_url")
+
+        if self.worker_listeners:
+            for listener in self.worker_listeners:
+                bind_address = listener.pop("bind_address", None)
+                bind_addresses = listener.setdefault("bind_addresses", [])
+
+                if bind_address:
+                    bind_addresses.append(bind_address)
+                elif not bind_addresses:
+                    bind_addresses.append('')