diff options
| author | reivilibre <oliverw@matrix.org> | 2022-06-30 12:58:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-30 11:58:12 +0000 |
| commit | 9667bad55d8b50fe08990a8cfd2ac82c8540bcc1 (patch) | |
| tree | 663c46095087d83481f7e459ed1d6f7f5ecd5105 /docker/configure_workers_and_start.py | |
| parent | Actually typecheck `tests.test_server` (#13135) (diff) | |
| download | synapse-9667bad55d8b50fe08990a8cfd2ac82c8540bcc1.tar.xz | |
Improve startup times in Complement test runs against workers, particularly in CPU-constrained environments. (#13127)
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Diffstat (limited to 'docker/configure_workers_and_start.py')
| -rwxr-xr-x | docker/configure_workers_and_start.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/configure_workers_and_start.py b/docker/configure_workers_and_start.py index 2134b648d5..4521f99eb4 100755 --- a/docker/configure_workers_and_start.py +++ b/docker/configure_workers_and_start.py @@ -26,6 +26,9 @@ # * SYNAPSE_TLS_CERT: Path to a TLS certificate in PEM format. # * SYNAPSE_TLS_KEY: Path to a TLS key. If this and SYNAPSE_TLS_CERT are specified, # Nginx will be configured to serve TLS on port 8448. +# * SYNAPSE_USE_EXPERIMENTAL_FORKING_LAUNCHER: Whether to use the forking launcher, +# only intended for usage in Complement at the moment. +# No stability guarantees are provided. # # NOTE: According to Complement's ENTRYPOINT expectations for a homeserver image (as defined # in the project's README), this script may be run multiple times, and functionality should @@ -525,6 +528,7 @@ def generate_worker_files( "/etc/supervisor/conf.d/synapse.conf", workers=worker_descriptors, main_config_path=config_path, + use_forking_launcher=environ.get("SYNAPSE_USE_EXPERIMENTAL_FORKING_LAUNCHER"), ) # healthcheck config @@ -560,6 +564,9 @@ def generate_worker_log_config( log_config_filepath, worker_name=worker_name, **extra_log_template_args, + include_worker_name_in_log_line=environ.get( + "SYNAPSE_USE_EXPERIMENTAL_FORKING_LAUNCHER" + ), ) return log_config_filepath |