File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -52,8 +52,8 @@ def configure_json_parser(name)
5252 when :oj
5353 return [ Oj . method ( :load ) , Oj ::ParseError ] if Fluent ::OjOptions . available?
5454
55- log &.info "Oj is not installed, and failing back to Yajl for json parser"
56- configure_json_parser ( :yajl )
55+ log &.info "Oj is not installed, and failing back to JSON for json parser"
56+ configure_json_parser ( :json )
5757 when :json then [ JSON . method ( :load ) , JSON ::ParserError ]
5858 when :yajl then [ Yajl . method ( :load ) , Yajl ::ParseError ]
5959 else
Original file line number Diff line number Diff line change @@ -28,12 +28,12 @@ def test_fall_back_oj_to_yajl_if_oj_not_available
2828
2929 result = @parser . instance . configure_json_parser ( :oj )
3030
31- assert_equal [ Yajl . method ( :load ) , Yajl :: ParseError ] , result
31+ assert_equal [ JSON . method ( :load ) , JSON :: ParserError ] , result
3232 logs = @parser . logs . collect do |log |
3333 log . gsub ( /\A \d {4}-\d {2}-\d {2} \d {2}:\d {2}:\d {2} [-+]\d {4} / , "" )
3434 end
3535 assert_equal (
36- [ "[info]: Oj is not installed, and failing back to Yajl for json parser\n " ] ,
36+ [ "[info]: Oj is not installed, and failing back to JSON for json parser\n " ] ,
3737 logs
3838 )
3939 end
You can’t perform that action at this time.
0 commit comments