[backport -> release/3.7.x] fix(cmd): do not override kong.conf if --db-timeout is not passed
#12981
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
…#12761) explicitly Prior to this fix, if the gateway was started using the kong cli, the final `pg_timeout` would be overridden to `60s` instead of the value specified in `kong.conf`, even if `--db-timeout` was not explicitly passed in. This was fixed by making cli args `--db-timeout` optional, so that only explicitly passed in arguments would override the `pg_timeout` otherwise the value specified in `kong.conf` would continue to be used. Co-authored-by: Hans Hübner <hans.huebner@gmail.com> (cherry picked from commit fd8707e)
team-gateway-bot
added
cherry-pick kong-ee
3 tasks
kikito
approved these changes
May 6, 2024
hanshuebner
approved these changes
May 6, 2024
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.
Automated backport to
release/3.7.x, triggered by a label in #12761.Original description
Summary
Prior to this fix, if the gateway was started using the kong cli, the final
pg_timeoutwould be overridden to60sinstead of the value specified inkong.conf, even if--db-timeoutwas not explicitly passed in. This was fixed by making cli args--db-timeoutoptional, so that only explicitly passed in arguments would override thepg_timeoutotherwise the value specified inkong.confwould continue to be used.Checklist
changelog/unreleased/kongorskip-changeloglabel added on PR if changelog is unnecessary. README.mdIssue reference
Fix #10307 (reply in thread)
KAG-4416