fluent-plugin-json-in-json-2 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3313464148f3479c2f659df84db3ad33e0fd0fb5
-  data.tar.gz: b7bd73c8f691d888d7c01c42dc09079e1f3acc04
+  metadata.gz: 1d1b8a01f1186485694e04e9aab84ba22d292fb1
+  data.tar.gz: b6816327d8350b8dc61c3b29f1fbddfc6990091f
 SHA512:
-  metadata.gz: a078226c7c1705533a13560332cd9f9433799702f77748485ccdc7ce3624f724d4e9d37ae5452ae838788c7e1e2e8fe5af47516b8fa05b11556b0925c5995eba
-  data.tar.gz: 23218b8a26437015d2b09ac04622cd1e59d99dff1f2948f220ebd6b68a1bc2f611ec39d551b655b708c618b2eb8dc67c4230f016efd7caaff695c4d6e315eca6
+  metadata.gz: 7e63efe8408c30193f928ab9b35a622529f8efdfa7ca6d102417e78b6bb372b7ee484c34a07f7755a0a797e128126f26b01546fa435cb9ae7c6022abd892107f
+  data.tar.gz: d51d6473474ee28621c0def79063df6f4a18874586df990e056c6163bf84e971fbda2d5b6688fd6fdfee2cdad8dfee9654e09a0eba63adec11df11b891355bad

data/fluent-plugin-json-in-json.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-json-in-json-2"
-  spec.version       = "1.0.1"
+  spec.version       = "1.0.2"
   spec.authors       = ["Gavin M. Roy", "Arcadiy Ivanov", "Alik Khilazhev"]
   spec.email         = ["gavinmroy@gmail.com", "arcadiy@ivanov.biz", "alikhil@mail.ru"]
   spec.description   = %q{Parser plugin that parses JSON attributes with JSON strings in them}

data/lib/fluent/plugin/parser_json_in_json.rb

@@ -24,12 +24,16 @@ module Fluent
 
         record.each do |k, v|
           if v.is_a?(String) && /^\s*(\{|\[)/ =~ v
-            deserialized = Yajl.load(v)
-            if deserialized.is_a?(Hash)
-              values.merge!(deserialized)
-              record.delete k
-            elsif deserialized.is_a?(Array)
-              values[k] = deserialized
+            begin
+              deserialized = Yajl.load(v)
+              if deserialized.is_a?(Hash)
+                values.merge!(deserialized)
+                record.delete k
+              elsif deserialized.is_a?(Array)
+                values[k] = deserialized
+              end
+            rescue Yajl::ParseError
+              # continue if failed to parse record
             end
           end
         end

data/test/test_parser.rb

@@ -1,6 +1,7 @@
 require_relative 'helper'
 require 'fluent/test/driver/parser'
 require 'fluent/plugin/parser_json_in_json'
+require 'yajl'
 
 class JsonInJsonParserTest < ::Test::Unit::TestCase
   def setup
@@ -43,7 +44,7 @@ class JsonInJsonParserTest < ::Test::Unit::TestCase
   def test_parse_string_time()
     @parser.configure('time_format' => '%Y-%m-%dT%H:%M:%S.%NZ', 'keep_time_key' => 'true')
     @parser.instance.parse('{"log":"2018-06-26 13:20:44.075  INFO --- [pool-8-thread-3] outgoing","stream":"stdout","time":"2018-06-26T13:20:44.076022960Z"}') { |time, record|
-      assert_equal(event_time('2018-06-26 13:20:44.076022960 -0400').to_f, time.to_f)
+      assert_equal(event_time('2018-06-26 13:20:44.076022960').to_f, time.to_f)
       assert_equal({
                     'log'=>'2018-06-26 13:20:44.075  INFO --- [pool-8-thread-3] outgoing',
                     'stream'=>'stdout',
@@ -51,4 +52,16 @@ class JsonInJsonParserTest < ::Test::Unit::TestCase
                    }, record)
     }
   end
+
+  def test_yajl_load()
+    @parser.configure({})
+    @parser.instance.parse('{ "log": " [ msg ] messoge  [ k ]", "stream": "stdout"}') { |time, record|
+      assert_equal({
+        'log'=> ' [ msg ] messoge  [ k ]',
+        'stream'=>'stdout',
+      }, record)
+    }
+    # Yajl.load('["kek":1}')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-json-in-json-2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gavin M. Roy