From e17471f74d76290c88a39ad4db5fdce844d43a4d Mon Sep 17 00:00:00 2001
From: Masahiro Nakagawa <repeatedly@gmail.com>
Date: Fri, 2 Mar 2018 05:55:54 +0900
Subject: [PATCH] parser_json: Add EncodingError to rescue list for oj 3.x. fix
 #1866

---
 lib/fluent/plugin/parser_json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fluent/plugin/parser_json.rb b/lib/fluent/plugin/parser_json.rb
index 0190d4c084..19160ce624 100644
--- a/lib/fluent/plugin/parser_json.rb
+++ b/lib/fluent/plugin/parser_json.rb
@@ -62,7 +62,7 @@ def parse(text)
         r = @load_proc.call(text)
         time, record = convert_values(parse_time(r), r)
         yield time, record
-      rescue @error_class
+      rescue @error_class, EncodingError # EncodingError is for oj 3.x or later
         yield nil, nil
       end