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

Refactor the configure_workers_and_start.py script used internally by Complement. #16650

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/16650.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Refactor the `configure_workers_and_start.py` script used internally by Complement.
4 changes: 2 additions & 2 deletions docker/conf-workers/synapse.supervisord.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ command=/usr/local/bin/python -m synapse.app.complement_fork_starter
--config-path="{{ main_config_path }}"
--config-path=/conf/workers/shared.yaml
{%- for worker in workers %}
-- {{ worker.app }}
-- synapse.app.generic_worker
--config-path="{{ main_config_path }}"
--config-path=/conf/workers/shared.yaml
--config-path=/conf/workers/{{ worker.name }}.yaml
Expand Down Expand Up @@ -36,7 +36,7 @@ exitcodes=0

{% for worker in workers %}
[program:synapse_{{ worker.name }}]
command=/usr/local/bin/prefix-log /usr/local/bin/python -m {{ worker.app }}
command=/usr/local/bin/prefix-log /usr/local/bin/python -m synapse.app.generic_worker
--config-path="{{ main_config_path }}"
--config-path=/conf/workers/shared.yaml
--config-path=/conf/workers/{{ worker.name }}.yaml
Expand Down
2 changes: 1 addition & 1 deletion docker/conf-workers/worker.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Values will be change depending on whichever workers are selected when
# running that image.

worker_app: "{{ app }}"
worker_app: "synapse.app.generic_worker"
worker_name: "{{ name }}"

worker_listeners:
Expand Down
Loading
Loading