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

Tweak `instantiate_worker_template`, both in name, description and variable names

rei/cwas_extension
Olivier Wilkinson (reivilibre) 2023-12-06 15:18:12 +00:00
parent 3318722753
commit da040e167d
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
docker/configure_workers_and_start.py
View File

@ -450,21 +450,22 @@ def merge_worker_template_configs(
) )
def insert_worker_name_for_worker_config( def instantiate_worker_template(
existing_template: WorkerTemplate, worker_name: str template: WorkerTemplate, worker_name: str
) -> Dict[str, Any]: ) -> Dict[str, Any]:
"""Insert a given worker name into the worker's configuration dict. """Given a worker template, instantiate it into a worker configuration
(which is currently represented as a dictionary).
Args: Args:
existing_template: The WorkerTemplate that is imported into shared_config. template: The WorkerTemplate to template
worker_name: The name of the worker to insert. worker_name: The name of the worker to use.
Returns: Copy of the dict with newly inserted worker name Returns: worker configuration dictionary
""" """
dict_to_edit = dataclasses.asdict(existing_template) worker_config_dict = dataclasses.asdict(template)
dict_to_edit["shared_extra_conf"] = existing_template.shared_extra_conf(worker_name) worker_config_dict["shared_extra_conf"] = template.shared_extra_conf(worker_name)
dict_to_edit["endpoint_patterns"] = sorted(existing_template.endpoint_patterns) worker_config_dict["endpoint_patterns"] = sorted(template.endpoint_patterns)
dict_to_edit["listener_resources"] = sorted(existing_template.listener_resources) worker_config_dict["listener_resources"] = sorted(template.listener_resources)
return dict_to_edit return worker_config_dict
def apply_requested_multiplier_for_worker(worker_types: List[str]) -> List[str]: def apply_requested_multiplier_for_worker(worker_types: List[str]) -> List[str]:
@ -781,7 +782,7 @@ def generate_worker_files(
) )
# Replace placeholder names in the config template with the actual worker name. # Replace placeholder names in the config template with the actual worker name.
worker_config: Dict[str, Any] = insert_worker_name_for_worker_config( worker_config: Dict[str, Any] = instantiate_worker_template(
worker_template, worker_name worker_template, worker_name
) )