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

Update user directory variable to right type and name #1177

Merged
merged 3 commits into from
Dec 20, 2021
Merged

Update user directory variable to right type and name #1177

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8f20e3
try undef instead of "null"
ShadowJonathan Dec 8, 2021
5fcf940
Update lib/SyTest/Homeserver/Synapse.pm
ShadowJonathan Dec 9, 2021
c58bb54
update name
ShadowJonathan Dec 9, 2021
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
4 changes: 3 additions & 1 deletion lib/SyTest/Homeserver/Synapse.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" : "null" ),
$self->{workers} ? (
update_user_directory_on => "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} ),
Comment on lines 271 to 273
Copy link
Member

@richvdh richvdh Dec 9, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

presumably once matrix-org/synapse#11450 lands, this will be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not directly, i'd like to wait until most/all branches have been updated with the develop branch, else you'll get unrelated sytest errors :/

I'll make a reminder to revisit this in a few months or so, then enumerate all open PRs, and see if they include the commit in their branch or not. If it's not a lot of PRs left, ill just boop them with "hey, please update to develop", and throw a PR in here which removes this option.

Expand Down