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.

Sign up for GitHub

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

Handle LoadError properly #2140

Merged
merged 1 commit into from
Oct 2, 2018
Merged

Handle LoadError properly #2140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/fluent/plugin/parser_json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,15 @@ def configure_json_parser(name)
else
raise "BUG: unknown json parser specified: #{name}"
end
rescue LoadError
rescue LoadError => ex
name = :yajl
log.info "Oj is not installed, and failing back to Yajl for json parser" if log
if log
if /\boj\z/ =~ ex.message
log.info "Oj is not installed, and failing back to Yajl for json parser"
else
log.warn ex.message
end
end
retry
end

Expand Down