From 115e50b8f58c9fc34f693d76c7b6cdb4a03898f7 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Thu, 16 Jun 2022 10:50:18 -0400 Subject: [PATCH 1/2] Use non-deprecated config options for Synapse. --- lib/SyTest/Homeserver/Synapse.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/SyTest/Homeserver/Synapse.pm b/lib/SyTest/Homeserver/Synapse.pm index a46b878fc..58c2c96ac 100644 --- a/lib/SyTest/Homeserver/Synapse.pm +++ b/lib/SyTest/Homeserver/Synapse.pm @@ -262,16 +262,13 @@ sub start # If we're using workers we need to disable these things in the main # process start_pushers => ( not $self->{workers} ), - notify_appservices => ( not $self->{workers} ), send_federation => ( not $self->{workers} ), enable_media_repo => ( not $self->{workers} ), run_background_tasks_on => ( $self->{workers} ? "background_worker1" : "master" ), $self->{workers} ? ( - update_user_directory_on => "user_dir", + notify_appservices_from_worker => "appservice", + update_user_directory_from_worker => "user_dir", ) : (), - # update_user_directory is kept for backwards compatibility, - # worker_to_update_user_directory is prioritized before this option. - update_user_directory => ( not $self->{workers} ), url_preview_enabled => "true", url_preview_ip_range_blacklist => [], From 34a4135ffd723d3216bf4edbe3f33c2d8b79f72c Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Thu, 16 Jun 2022 10:55:05 -0400 Subject: [PATCH 2/2] Use generic worker. --- lib/SyTest/Homeserver/Synapse.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/SyTest/Homeserver/Synapse.pm b/lib/SyTest/Homeserver/Synapse.pm index 58c2c96ac..4fc55e335 100644 --- a/lib/SyTest/Homeserver/Synapse.pm +++ b/lib/SyTest/Homeserver/Synapse.pm @@ -696,7 +696,7 @@ sub _start_synapse { my $appservice_config = { - "worker_app" => "synapse.app.appservice", + "worker_app" => "synapse.app.generic_worker", "worker_name" => "appservice", "worker_pid_file" => "$hsdir/appservice.pid", "worker_log_config" => $self->configure_logger("appservice"), @@ -882,7 +882,7 @@ sub _start_synapse { my $user_dir_config = { - "worker_app" => "synapse.app.user_dir", + "worker_app" => "synapse.app.generic_worker", "worker_name" => "user_dir", "worker_pid_file" => "$hsdir/user_dir.pid", "worker_log_config" => $self->configure_logger("user_dir"),