From c8f20e340494c5639a3811cbc1e64672b98e1fb7 Mon Sep 17 00:00:00 2001 From: Jonathan de Jong Date: Wed, 8 Dec 2021 19:47:42 +0100 Subject: [PATCH 1/3] try undef instead of "null" --- lib/SyTest/Homeserver/Synapse.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/SyTest/Homeserver/Synapse.pm b/lib/SyTest/Homeserver/Synapse.pm index 264be18c2..db22da4af 100644 --- a/lib/SyTest/Homeserver/Synapse.pm +++ b/lib/SyTest/Homeserver/Synapse.pm @@ -265,7 +265,7 @@ sub start send_federation => ( not $self->{workers} ), enable_media_repo => ( not $self->{workers} ), run_background_tasks_on => ( $self->{workers} ? "background_worker1" : "master" ), - worker_to_update_user_directory => ( $self->{workers} ? "user_dir" : "null" ), + worker_to_update_user_directory => ( $self->{workers} ? "user_dir" : undef ), # update_user_directory is kept for backwards compatibility, # worker_to_update_user_directory is prioritized before this option. update_user_directory => ( not $self->{workers} ), From 5fcf940eba8bc8e0ab138c699c92de7dd8a61c4b Mon Sep 17 00:00:00 2001 From: Jonathan de Jong Date: Thu, 9 Dec 2021 13:51:10 +0100 Subject: [PATCH 2/3] Update lib/SyTest/Homeserver/Synapse.pm Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> --- lib/SyTest/Homeserver/Synapse.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/SyTest/Homeserver/Synapse.pm b/lib/SyTest/Homeserver/Synapse.pm index db22da4af..fdfe0c21c 100644 --- a/lib/SyTest/Homeserver/Synapse.pm +++ b/lib/SyTest/Homeserver/Synapse.pm @@ -265,7 +265,9 @@ sub start send_federation => ( not $self->{workers} ), enable_media_repo => ( not $self->{workers} ), run_background_tasks_on => ( $self->{workers} ? "background_worker1" : "master" ), - worker_to_update_user_directory => ( $self->{workers} ? "user_dir" : undef ), + $self->{workers} ? ( + worker_to_update_user_directory => "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} ), From c58bb54a6478dc9fb46f93989aba5d3923942750 Mon Sep 17 00:00:00 2001 From: Jonathan de Jong Date: Thu, 9 Dec 2021 15:24:46 +0100 Subject: [PATCH 3/3] update name --- lib/SyTest/Homeserver/Synapse.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/SyTest/Homeserver/Synapse.pm b/lib/SyTest/Homeserver/Synapse.pm index fdfe0c21c..23b60346a 100644 --- a/lib/SyTest/Homeserver/Synapse.pm +++ b/lib/SyTest/Homeserver/Synapse.pm @@ -266,7 +266,7 @@ sub start enable_media_repo => ( not $self->{workers} ), run_background_tasks_on => ( $self->{workers} ? "background_worker1" : "master" ), $self->{workers} ? ( - worker_to_update_user_directory => "user_dir", + update_user_directory_on => "user_dir", ) : (), # update_user_directory is kept for backwards compatibility, # worker_to_update_user_directory is prioritized before this option.