Merge pull request #1835 from matrix-org/erikj/fix_workers

Make worker listener config backwards compat
2017-01-20 11:55:56 +00:00 · 2017-01-20 11:55:56 +00:00 · 86063d4321
parent 691c8198b7 97efe99ae9
commit 86063d4321
1 changed files with 10 additions and 0 deletions
--- 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('')