Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 4c8ff2e

Browse files
committed
Use merge_into when adding workers to the shared config
1 parent 853937f commit 4c8ff2e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

docker/configure_workers_and_start.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -784,10 +784,9 @@ def generate_worker_files(
784784
{"name": worker_name, "port": str(worker_port), "config_path": config_path}
785785
)
786786

787-
# Update the shared config with any worker_type specific options. The first of a
788-
# given worker_type needs to stay assigned and not be replaced.
789-
worker_config["shared_extra_conf"].update(shared_config)
790-
shared_config = worker_config["shared_extra_conf"]
787+
# Update the shared config with any options needed to enable this worker.
788+
merge_into(shared_config, worker_config["shared_extra_conf"])
789+
791790
if using_unix_sockets:
792791
healthcheck_urls.append(
793792
f"--unix-socket /run/worker.{worker_port} http://localhost/health"

0 commit comments

Comments
 (0)