parser_json: fix wrong LoadError warning #4522
Merged
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
daipom
force-pushed
the
parser_json-fix-wrong-LoadError-warning
branch
from
b25e989 to
151e631
Compare
ashie
requested changes
Jun 8, 2024
Member
ashie
left a comment
ashie
left a comment
There was a problem hiding this comment.
It seems that this rescue no longer needed.
It would be better to do retry at when :oj instead of rescue block.
daipom
force-pushed
the
parser_json-fix-wrong-LoadError-warning
branch
2 times, most recently
from
d515b3a to
29ff381
Compare
Contributor
Author
Thanks for your review! |
If Oj is not installed, LoadError with the empty message is raised.
So, the current condition `/\boj\z/.match?(ex.message)` does not work
and the following meaningless warning is displayed.
{datetime} [warn]: #x {id} LoadError
After this fix, the log message will be:
{datetime} [info]: #x {id} Oj is not installed, and failing back to
Yajl for json parser
Refactor "rescue" logic because this falling back feature is
currently only for "oj" (LoadError can not occur for "json" and
"yajl").
Signed-off-by: Daijiro Fukuda <[email protected]>
Co-authored-by: Takuro Ashie <[email protected]>
daipom
force-pushed
the
parser_json-fix-wrong-LoadError-warning
branch
from
29ff381 to
891ce71
Compare
Contributor
Author
|
It looks like |
ashie
approved these changes
Jun 12, 2024
Member
|
Thanks! |
Contributor
Author
|
Thanks for your review! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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:
None
What this PR does / why we need it:
If Oj is not installed, LoadError with the empty message is raised.
fluentd/lib/fluent/plugin/parser_json.rb
Line 53 in b25e989
So, the current condition
/\boj\z/.match?(ex.message)does not work and the following meaningless warning is displayed.After this fix, the log message will be:
Docs Changes:
Not needed.
Release Note:
Same as the title.