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

Commit a7d38e5

Browse files
committed
Use merge_into when adding workers to the shared config
1 parent bf541ac commit a7d38e5

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
@@ -785,10 +785,9 @@ def generate_worker_files(
785785
{"name": worker_name, "port": str(worker_port), "config_path": config_path}
786786
)
787787

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

0 commit comments

Comments
 (0)