OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Use `merge_into` when adding workers to the shared config

rei/cwas_extension
Olivier Wilkinson (reivilibre) 2023-11-16 15:55:37 +00:00
parent f49dbc7ba7
commit 3bb21a9c26
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/configure_workers_and_start.py
View File

@ -784,10 +784,9 @@ def generate_worker_files(
{"name": worker_name, "port": str(worker_port), "config_path": config_path} {"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 # Update the shared config with any options needed to enable this worker.
# given worker_type needs to stay assigned and not be replaced. merge_into(shared_config, worker_config["shared_extra_conf"])
worker_config["shared_extra_conf"].update(shared_config)
shared_config = worker_config["shared_extra_conf"]
if using_unix_sockets: if using_unix_sockets:
healthcheck_urls.append( healthcheck_urls.append(
f"--unix-socket /run/worker.{worker_port} http://localhost/health" f"--unix-socket /run/worker.{worker_port} http://localhost/health"