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 the parser options with values from config file. Fixes #8447. #9040

Conversation

s0undt3ch
Copy link
Member

The way the parser merges the CLI configuration with the file configuration is.

For each option:

  1. If a value was passed to the CLI, that value rules.
  2. If not value was passed to the CLI and no value is defined in the config file. The default, it any, is used.
  3. If a value is not passed to the CLI and the value is defined in the config file, the config file one will be used.

Some code was using the parser options for logic and values after the configuration loaded, but the parser options were never updated to the configuration files values.
So:

  1. Do what we said in the above 3, and, update the parser option to have that value.

…ck#8447.

The way the parser merges the CLI configuration with the file configuration is.

For each option:

  1. If a value was passed to the CLI, that value rules.
  2. If not value was passed to the CLI and no value is defined in the config file. The default, it any, is used.
  3. If a value is not passed to the CLI and the value is defined in the config file, the config file one will be used.

Some code was using the parser options for logic and values after the configuration loaded, but the parser options were never updated to the configuration files values.
So:

  4. Do what we said in the above 3, **and**, update the parser option to have that value.
@s0undt3ch
Copy link
Member Author

Tagging @cachedout.

thatch45 added a commit that referenced this pull request Dec 6, 2013
…igfile-not-respected

Update the parser options with values from config file. Fixes #8447.
@thatch45 thatch45 merged commit 69dc9f7 into saltstack:develop Dec 6, 2013
@s0undt3ch s0undt3ch deleted the issues/8447-timeout-from-configfile-not-respected branch April 24, 2020 09:34
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.

None yet

2 participants