diff options
| author | Jason Little <realtyem@gmail.com> | 2023-03-08 05:24:42 -0600 |
|---|---|---|
| committer | Jason Little <realtyem@gmail.com> | 2023-03-08 05:24:42 -0600 |
| commit | 204f61e022b5220c8ef9050d7b0f1e1277b7a2c1 (patch) | |
| tree | c3adf7f1790137854ba1ac413a3e550a57aa1c07 | |
| parent | Update comments and a few other texty bits: (diff) | |
| download | synapse-204f61e022b5220c8ef9050d7b0f1e1277b7a2c1.tar.xz | |
Update how worker_type specific options are merged into shared_config, and update comments to match.
| -rwxr-xr-x | docker/configure_workers_and_start.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py index f98187f4c9..66b5aa31c6 100755 --- a/docker/configure_workers_and_start.py +++ b/docker/configure_workers_and_start.py @@ -867,10 +867,10 @@ def generate_worker_files( {"name": worker_name, "port": str(worker_port), "config_path": config_path} ) - # Update the shared config with any worker-type specific options. Do a dance so - # the first of a given worker type gets to stay assigned. + # Update the shared config with any worker_type specific options. The first of a + # given worker_type needs to stay assigned and not be replaced. worker_config["shared_extra_conf"].update(shared_config) - shared_config.update(worker_config["shared_extra_conf"]) + shared_config = worker_config["shared_extra_conf"] healthcheck_urls.append("http://localhost:%d/health" % (worker_port,)) |