Fix problem that some system configs are not reflected #4064
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
Options explicitly specified in command line should be preferred to options specified in system config. However, options that have a default value, such as `suppress_repeated_stacktrace`, are preferred even when they are not specified in the command line. Because of this, the following setting is not be reflected. ``` <system> suppress_repeated_stacktrace false </system> ``` Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
daipom
commented
Feb 20, 2023
|
We can discard this logic now, and we should have the corresponding test here too, |
Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
This priority problem is fixed fundamentally, so we don't need this logic now. Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
Fixed. |
|
Sorry for the delay, I missed the additional fixes... |
|
Thanks for your review! |
daipom
added a commit
to daipom/fluentd
that referenced
this pull request
Mar 12, 2023
Fix bug of: * fluent#4064 * 8e9f46a Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
ashie
reviewed
Mar 13, 2023
| end | ||
| return unless b | ||
| cur_level = cmd_opts.fetch(:log_level, default_opts[:log_level]) | ||
| cmd_opts[:log_level] = [cur_level + 1, Fluent::Log::LEVEL_TRACE].max |
There was a problem hiding this comment.
Sorry for my simple mistake.
daipom
added a commit
to daipom/fluentd
that referenced
this pull request
Aug 19, 2024
This option is explained as "add plugin directory". However, since v1.16.0, the behavior has changed to overwrite the default value unintentionally. (PR: fluent#4064, commit: 41678bf). We should revert it to the original behavior. Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
daipom
added a commit
to daipom/fluentd
that referenced
this pull request
Aug 19, 2024
This option is explained as "add plugin directory". However, since v1.16.0, the behavior has changed to overwrite the default value unintentionally. (PR: fluent#4064, commit: 41678bf). We should revert it to the original behavior. Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
daipom
added a commit
that referenced
this pull request
Aug 20, 2024
Backported from fe5843f --- This option is explained as "add plugin directory". However, since v1.16.0, the behavior has changed to overwrite the default value unintentionally. (PR: #4064, commit: 41678bf). We should revert it to the original behavior. Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
daipom
added a commit
that referenced
this pull request
Aug 20, 2024
Backported from fe5843f --- This option is explained as "add plugin directory". However, since v1.16.0, the behavior has changed to overwrite the default value unintentionally. (PR: #4064, commit: 41678bf). We should revert it to the original behavior. Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
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.
Which issue(s) this PR fixes:
I found this problem during fixing:
I thought this should be fixed in a separate PR, so I made this PR first.
What this PR does / why we need it:
Options explicitly specified in command line should be preferred to options specified in system config.
However, options that have a default value, such as
suppress_repeated_stacktrace, are preferred even when they are not specified in the command line.Because of this, the following setting is not reflected.
In order to realize this specification, we should pass only options that are explicitly specified in the command line to
Superviser.new().Docs Changes:
Not needed.
Release Note:
Same as the title.
This PR allows
suppress_repeated_stacktracefrom SystemConfig to be reflected to the supervisor correctly, but we still have the problem that it is not reflected to the workers.It will be fixed at