-
Notifications
You must be signed in to change notification settings - Fork 1.5k
[Fix #3044] Set conditional config defaults after CLI options are parsed and config files are loaded #3297
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
[Fix #3044] Set conditional config defaults after CLI options are parsed and config files are loaded #3297
Conversation
f977233
to
3ac0f65
Compare
3ac0f65
to
d4f9f5d
Compare
0b9d9ed
to
3caaef8
Compare
Are the test failures related to (these) tests now using preloading (and that causes some problem)? While #3044 is classed as a bug, it is quite the change in behaviour... so maybe the fix should be shipped in a major version? |
I think some of the phased restart failures are because of this clause. We should just make Edit: I think I misunderstood that condition. It seems that
I agree, and yes the issue was added to the |
3caaef8
to
dbb42e6
Compare
4b7d90d
to
fe5dec5
Compare
fe5dec5
to
ace3c3f
Compare
3ae362c
to
e9fb62a
Compare
ced1461
to
1ceab3c
Compare
00108d0
to
3052d13
Compare
I've updated this to target #3616. Once that has been merged, this should go green after rebasing. |
0f26974
to
6a2c61b
Compare
174dbe7
to
e24adde
Compare
Nvm, I've just patched those tests here. Now neither is dependant on the other and both should cleanly rebase after the other is merged. |
I'm not sure why but the UX is telling me that @nateberkopec requested changes even though I don't see the request (and I see an approval from him). All tests are now green. @nateberkopec can you merge in or re-iterate your concerns that seem to have been lost to the snads of time? |
It was because there was a test failure:
Which has since been resolved:
|
Re #3616, just checking if the above is still true. I haven't looked much at this one, but @nateberkopec went thru it... |
Probably not with my recent changes. Once #3616 has been merged, I'll come and clean this up. I might have to update the FWIW, if I had to pick a PR (of mine) that definitely should go out with v7, it would be this one. I've worked with 2 monoliths now where they almost set cc @schneems |
#3616 is merged. Can you rebase on master/main (thanks). |
f5fe418
to
29ddb58
Compare
Cancel 'older' CI tests? |
Yes please, thank you! |
… parsed and config files are loaded
29ddb58
to
62036f4
Compare
Done 👍🏽 |
PR has been open since Dec-2023, and the requested changes aren't apparent.
Description
Closes #3044
CLI
options are parsed duringCLI
initialisation, but afterConfiguration
initialisation. This PR changes this so that the parsing takes place duringConfiguration
initialisation. This ensures thatCLI
options are also used when some config defaults are conditionally set during initialisation.Note: Even with the changes in this PRpreload_app
isn't enabled by default if using#workers
in a config file. I'm happy to address that here too if prefered. Else we have an inconsistency with the cli and config file.Addressed in these changes. We now ensure that conditional defaults are also set when config files are loaded.
Warning
The side effect of these changes which fixes the linked issue is that
preload_app
is now consistently enabled by default regardless of configuration method if these conditions are met.Your checklist for this pull request
[ci skip]
to the title of the PR.#issue
" to the PR description or my commit messages.