param: Optionally pass a duration unit to timeouts #3766
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nigoroll
reviewed
Jan 3, 2022
bsdphk
reviewed
Jan 4, 2022
| @@ -67,29 +69,29 @@ parse_decimal(const char *p, const char **err) | |||
|
|
|||
| static int | |||
| tweak_generic_double(struct vsb *vsb, const char *arg, const struct parspec *pp, | |||
| const char *fmt) | |||
| parse_double_f parse, const char *fmt) | |||
There was a problem hiding this comment.
I would have made the parse argument default to parse_decimal if NULL.
There was a problem hiding this comment.
Do we really need a default for a static function with 3 call sites?
bsdphk
reviewed
Jan 4, 2022
bin/varnishd/mgt/mgt_param_tweak.c
Outdated
| pt.priv = &px.max_age; | ||
| pt.min = "0"; | ||
| pt.max = "1000000"; | ||
| retval = tweak_generic_double(vsb, av[3], &pt, "%.0f"); |
There was a problem hiding this comment.
So this is pretty much exactly why I made those arguments explicit to tweak_generic_double in the first place.
I'm not a fan of this ephemeral parspec, but I can live with it.
There was a problem hiding this comment.
I made a u-turn here because the function signature was requiring more effort than the temporary parspec.
This is a first step towards even more generalization.
By themselves, structured fields parsing functions don't fail on extra input. To avoid repeating the same checks twice, they are wrapped into a function that will help generalize tweak_generic_double() at least once more.
Allowing units is much more convenient and keeping them optional maintains compatibility. On the other hand, changing the defaults for default_ttl and default_grace has no impact on the generated RST. Keeping track of the user input could help since default values are "washed" like user input, without resorting to a dynamic default. Refs varnishcache#3756
|
Rebased against master to solve the merge conflict after having pushed e2220de directly. |
dridi
added a commit
that referenced
this pull request
Jan 11, 2022
dridi
added a commit
that referenced
this pull request
Jan 11, 2022
|
OK with me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allowing units is much more convenient and keeping them optional
maintains compatibility. On the other hand, changing the defaults
for default_ttl and default_grace has no impact on the generated
RST.
Keeping track of the user input could help since default values
are "washed" like user input, without resorting to a dynamic
default.
Refs #3756