Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use non-deprecated config options for Synapse. #1260

Merged
merged 2 commits into from
Jun 17, 2022
Merged

Use non-deprecated config options for Synapse. #1260

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
115e50b
Use non-deprecated config options for Synapse.
clokep Jun 16, 2022
34a4135
Use generic worker.
clokep Jun 16, 2022
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
11 changes: 4 additions & 7 deletions lib/SyTest/Homeserver/Synapse.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [],
Expand Down Expand Up @@ -699,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"),
Expand Down Expand Up @@ -885,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"),
Expand Down