config: fix duplicate config file loading in config_include_dir #5228
+446
−21
Conversation
This file contains hidden or 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
Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
Watson1978
force-pushed
the
conf.d
branch
2 times, most recently
from
3215bf9 to
06b7380
Compare
Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
Watson1978
commented
Jan 15, 2026
| end | ||
| end | ||
|
|
||
| @on_file_parsed&.call(File.expand_path(File.join(@include_basepath, @fname))) if root_element |
Contributor
Author
There was a problem hiding this comment.
File.join(@include_basepath, @fname) returns an absolute path,
however it doesn't include the drive letter on Windows systems.
It uses File.expand_path together to get the full absolute path.
kenhys
reviewed
Jan 15, 2026
| # reload | ||
| supervisor.__send__(:reload_config) | ||
| reload_elements = supervisor.instance_variable_get(:@conf).elements | ||
| assert_equal(elements, reload_elements) |
Contributor
There was a problem hiding this comment.
It might be better to check log message too.
Contributor
Author
There was a problem hiding this comment.
Added tests to check log message.
d12af91
|
|
||
| assert_equal('source', elements[3].name) | ||
| assert_equal('obsolete_plugins', elements[3]['@type']) | ||
| end |
Contributor
Contributor
Author
Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
Watson1978
added
the
backport to v1.19
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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:
Fixes #
Ref. #5100
What this PR does / why we need it:
Currently, if a user explicitly
@includes a file that is also locatedin
config_include_dir, the file is loaded twice.This causes startup failures due to port conflicts or ID duplication.
This commit introduces a deduplication mechanism using a callback:
on_file_parsedcallback toFluent::Config.buildto track files loaded during the user config parsing phase.Supervisor, record loaded files via this callback.config_include_dir, skip files that have already been loaded in the user configuration.Docs Changes:
Release Note: