fluent-plugin-json_expander 0.0.1.pre → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd0e91d385a1c563f4eeda19098692538e510d20
-  data.tar.gz: 1c35f48f84214ab5e9e1c3b872c7852b19631f80
+  metadata.gz: d583201256a49ab2c2ca48747f882c55aa3397fe
+  data.tar.gz: b91660f95dedaf77e44ba9b2490c0d245bc828f6
 SHA512:
-  metadata.gz: 3b6fdbddb5dd1aaed2317c129fd1f1fa66c6cc66cfac2f8cf407fdd49e8ef04ceba667270f261026a7d8bc3dae574e7113a63a7dfc20bf7f2f7de7244f12b634
-  data.tar.gz: dc05731acc6313db0faad2074543cd1036be1c56343dabfa60a14ec5c61ca484cd49a1d33deb7614eb5b8735f05d29cfea9e27504dccfaf564f445082f4018e4
+  metadata.gz: 69e2106ffe9668eadcc54f011cbfec61d250c6d4d1bccc280f9743ccf4b3e7eb20918616a87f24b35e806938bfc09b08e834c8208ea4bd2d25e2ecf4f3013546
+  data.tar.gz: 4137b0ec45ec23e2a9c39ca6e81c6808c1a91065091621c13de31145009539e5e9ee5ffd6bab85763449301f01a2cf02c6334404b2fd26b59b395e50827c22ff

data/fluent-plugin-json_expander.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-json_expander"
-  spec.version       = "0.0.1.pre"
+  spec.version       = "0.0.1"
   spec.authors       = ["Uchio KONDO"]
   spec.email         = ["udzura@udzura.jp"]
 

data/lib/fluent/plugin/out_json_expander.rb

@@ -43,13 +43,13 @@ class Fluent::JsonExpanderOutput < Fluent::MultiOutput
       tag = tag[@removed_length..-1]
     end
     if @add_prefix
-      tag = tag.empty? ? (@added_prefix_string + tag) : @add_prefix
+      tag = tag.empty? ? @add_prefix : (@added_prefix_string + tag)
     end
 
     es.each {|time, record|
-      output = new_output(record)
+      output, new_record = *new_output(record)
       if output
-        dup_es = Fluent::ArrayEventStream.new([[time, record]])
+        dup_es = Fluent::ArrayEventStream.new([[time, new_record]])
         null_chain = Fluent::NullOutputChain.instance
         output.emit(tag, dup_es, null_chain)
       end
@@ -64,7 +64,8 @@ class Fluent::JsonExpanderOutput < Fluent::MultiOutput
     t = @template
     begin
       @mutex.synchronize do
-        if e = expand_elm(t, data)
+        e, data = expand_elm(t, data)
+        if e
           o = Fluent::Plugin.new_output(@subtype)
           o.configure(e)
           o.start
@@ -86,7 +87,7 @@ class Fluent::JsonExpanderOutput < Fluent::MultiOutput
       o = nil
     end
 
-    return o
+    return o, data
   end
 
   SCAN_DATA_RE = /\$\{data\[(?:[_a-zA-Z][_a-zA-Z0-9]*)\]\}/
@@ -100,11 +101,11 @@ class Fluent::JsonExpanderOutput < Fluent::MultiOutput
         if !key_matched or !key_matched[0]
           raise(Fluent::ConfigError, "[BUG] data matched in template, but could not find key name")
         end
-        if @handle_empty_as_error
-          k = key_matched[0]
-          data[k] || mark_errored(k, data)
+        target = key_matched[0]
+        if @delete_used_key
+          data.delete(target) || on_empty_data(target, data)
         else
-          data[key_matched[0]] || ""
+          data[target] || on_empty_data(target, data)
         end
       end
       attr[k] = v
@@ -113,14 +114,17 @@ class Fluent::JsonExpanderOutput < Fluent::MultiOutput
     sub_elms = template.elements.map {|e| expand_elm(data) }
 
     if @mark_errored
-      nil
+      return nil, nil
     else
-      Fluent::Config::Element.new('instance', '', attr, sub_elms)
+      return Fluent::Config::Element.new('instance', '', attr, sub_elms), data
     end
   end
 
-  def mark_errored(k, data)
-    log.error "Could not find value for `#{k}' in data #{data.inspect}, Fluentd skips this"
-    @mark_errored = true
+  def on_empty_data(k, data)
+    if @handle_empty_as_error
+      log.error "Could not find value for `#{k}' in data #{data.inspect}, Fluentd skips this"
+      @mark_errored = true
+    end
+    ""
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-json_expander
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.1
 platform: ruby
 authors:
 - Uchio KONDO
@@ -128,9 +128,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.3