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

buf_file/buf_file_single: fix to ignore placeholder based path. fix #2582 #2594

Merged
merged 1 commit into from
Sep 2, 2019

Conversation

repeatedly
Copy link
Member

Signed-off-by: Masahiro Nakagawa [email protected]

Which issue(s) this PR fixes:
Fixes #2582

What this PR does / why we need it:
fluentd uses { and } for placeholders and these characters are special in Dir.glob.
Should be escaped before call Dir.glob.

Docs Changes:
No need.

Release Note:
Same as title.

@repeatedly repeatedly added the bug Something isn't working label Aug 30, 2019
@repeatedly repeatedly requested a review from ganmacs August 30, 2019 02:34
@repeatedly repeatedly self-assigned this Aug 30, 2019
@ganmacs
Copy link
Member

ganmacs commented Aug 30, 2019

This patch looks good. but can we change child elements(in this context buffer section) not to access the parent node's setting(in this context match section and @type is file). #2582 (comment)

I don't think path in buffer section and path in match section are completely different.

@repeatedly
Copy link
Member Author

can we change child elements(in this context buffer section) not to access the parent node's setting(in this context match section and @type is file)

Which point? out_file set path to buffer's path when <buffer> doesn't have path. buf_file doesn't access out_file's path.

Copy link
Member

@ganmacs ganmacs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. I misread… out_file sets path to buffer's path here

@repeatedly repeatedly merged commit c7a825c into master Sep 2, 2019
@repeatedly repeatedly deleted the fix-buf_file-placeholder-path branch September 2, 2019 06:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

File output plugin cannot resume with path placeholders
2 participants