fluent-plugin-json-in-json 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 868c883a280025a4d5ac0260b062e12f48b2c3d4
-  data.tar.gz: 7f6a866ed648c2eca97d265bec148c8a11660040
+  metadata.gz: 3789a3629e0e671eb764ab5595d8413b5f81cd94
+  data.tar.gz: 61dabe27f92345bd68d63f35d1a21073846be1ea
 SHA512:
-  metadata.gz: 5aecc10aa4d2f649a22b2d6166f2eb8bb1ebbd151503b6ed7fa71c6e6f1607d87d3081e9bb5f3d85220c214cc0ee63099c1892ab0d9a9da9ecc4a839d315708b
-  data.tar.gz: 18ba0722a89c88ad0a1be633721bfcbed9acfaf8ee8efa4f4c93f9b154055879076b73dfbe376d8cd4e0182fa3c29da11cc301f34b1049e42cbba4a96cbcf25a
+  metadata.gz: b5adece8e91b855924b70754304d4e03aaf5a5c68bef3721e99ad2b775aad74a60135478421cc9604011a4cbd01d07ea69a9359ef5afa0b238ad6fff8615f1f3
+  data.tar.gz: 4d5f2020967256ac3898fb73d35f9c4224a962a152cecdb7bc122230ca0ce75dd1fec1bb6d5b10bb9d0c1721c5c8353d1846deb979810961c8d8bff16df4eb18

data/README.md

@@ -1,7 +1,7 @@
 # fluent-plugon-json-in-json
 
 This fluentd parser plugin parses JSON log lines with nested JSON strings. For
-example, given a docker log of ``{"log": "{\"foo\": \"bar\"}"}, the log record
+example, given a docker log of ``{"log": "{\"foo\": \"bar\"}"}``, the log record
 will be parsed into ``{:log => { :foo => "bar" }}``.
 
 ## Installation

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"
-  spec.version       = "0.1.3"
+  spec.version       = "0.1.4"
   spec.authors       = ["Gavin M. Roy"]
   spec.email         = ["gavinmroy@gmail.com"]
   spec.description   = %q{Parser plugin that parses JSON attributes with JSON strings in them}

data/lib/fluent/plugin/parser_json_in_json.rb

@@ -39,14 +39,17 @@ module Fluent
           end
         end
 
+        values = Hash.new
         record.each do |k, v|
-          if v[0] == '{' and v[-1] == '}'
-            h = Yajl.load(v)
-            h.each do |vk, vv|
-              record[vk] = vv
+          if v[0] == '{'
+            deserialized = Yajl.load(v)
+            if deserialized.is_a?(Hash)
+              values.merge!(deserialized)
+              record.delete k
             end
           end
         end
+        record.merge!(values)
 
         if block_given?
           yield time, record

metadata

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