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.

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

Conversation

ShadowJonathan
Copy link
Contributor

@ShadowJonathan ShadowJonathan commented Dec 8, 2021

This fixes a small problem introduced by #1174, i thought that "null" would become a null yaml value, but it seems not.

This tries undef() instead.


After some review over in matrix-org/synapse#11450 im also using this PR to change over the config variable name to update_user_directory_on

@ShadowJonathan ShadowJonathan requested a review from a team as a code owner December 8, 2021 18:52
Comment on lines 269 to 271
# update_user_directory is kept for backwards compatibility,
# worker_to_update_user_directory is prioritized before this option.
update_user_directory => ( not $self->{workers} ),
Copy link
Member

@richvdh richvdh Dec 9, 2021

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.

Co-authored-by: Richard van der Hoff <[email protected]>
@ShadowJonathan
Copy link
Contributor Author

ShadowJonathan commented Dec 9, 2021

I'm changing this to address matrix-org/synapse#11450 (comment), so i dont throw in a third PR after the fact, to make a single change, stand by.

@ShadowJonathan ShadowJonathan marked this pull request as draft December 9, 2021 14:11
@ShadowJonathan ShadowJonathan changed the title Try undef instead of "null" Update user directory variable to right type and name Dec 9, 2021
@ShadowJonathan ShadowJonathan marked this pull request as ready for review December 9, 2021 14:24
Copy link
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

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

Normally I'd say that we should wait for the synapse PR to be a bit closer to being ready, but that ship already sailed with #1174, so this isn't making anything worse.

@richvdh richvdh merged commit fd4f11d into matrix-org:develop Dec 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants