From 3bb21a9c265f24c5855c72aac3cb222b8fb3daff Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Thu, 16 Nov 2023 15:55:37 +0000 Subject: [PATCH] Use `merge_into` when adding workers to the shared config --- docker/configure_workers_and_start.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py index 3d5fe3a73c..a9f4831194 100755 --- a/docker/configure_workers_and_start.py +++ b/docker/configure_workers_and_start.py @@ -784,10 +784,9 @@ 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. 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 = worker_config["shared_extra_conf"] + # Update the shared config with any options needed to enable this worker. + merge_into(shared_config, worker_config["shared_extra_conf"]) + if using_unix_sockets: healthcheck_urls.append( f"--unix-socket /run/worker.{worker_port} http://localhost/health"