fluent-plugin-reemit 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92a5d08ac9438d11190b6bfd139a5bbb12cc501f
-  data.tar.gz: 44a90ef06dbf130eac54648ea03d8ca2e9c9e83f
+  metadata.gz: abcbfb610626eb4038ac21e8def1cce86b64af7e
+  data.tar.gz: 021b16439391856c15503b60b9623732f912c2c5
 SHA512:
-  metadata.gz: d92f99ad94d1d5c8b3a14b460054908e73cce1a409abb0b76943b6bad656204cae444f7900390e9f70e2aed154cb44cb6a3d259e03c7e837df8cb9e96b451860
-  data.tar.gz: 0d032e86c8f337b3280fdd4933eda7ccabbb87181196627c971da9807f22d5ab6daf85c7700da107f67ad67f1a113290cba5eb03f371c981b4926312325a3c10
+  metadata.gz: ebbb3ea9c22854ef7ef31ef10ee921d33c1ac0c77f188c82288273ddd6ff989db0bf661820ed4e5f62c2c0863d33e335cbb89308866c9e77265cde960472c3bd
+  data.tar.gz: fc8e173c685930842fa52ae966457dbf245a61dc9214e6dff0ae95924c10573f45626fc3e0f2efa468db9535f4944b435cf647cef3d608ed3e210b537ba66854

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1
 gemfile:
   - Gemfile
   - Gemfile.v0.12

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0 (2015/08/06)
+
+Enhancements:
+
+* support multiple reemit statements for same match (thanks to vijaykramesh)
+
 ## 0.1.0 (2014/11/26)
 
 Changes:

data/Gemfile.v0.12

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 gemspec
 gem 'fluent-plugin-flowcounter' # for examples
-gem 'fluentd', git: 'git@github.com:fluent/fluentd'
+gem 'fluentd', git: 'https://github.com/fluent/fluentd'

data/examples/multiple_reemit.conf

@@ -0,0 +1,36 @@
+<source>
+  type gc_stat
+  emit_interval 1s
+  tag gc_stat
+</source>
+
+<match flowcount>
+  type stdout
+</match>
+
+<match **>
+  type copy
+  <store>
+    type flowcounter
+    count_keys *
+    unit second
+  </store>
+  <store>
+    type reemit # re-emitted messages are not absorbed by <match **>
+  </store>
+</match>
+
+
+<match gc_stat>
+  type copy
+  <store>
+    type stdout
+  </store>
+  <store>
+    type reemit # re-emitted messages are not absorbed by <match **> OR the <match gc_stat>
+  </store>
+</match>
+
+<match **>
+  type stdout
+</match>

data/examples/reemit.conf

@@ -13,6 +13,7 @@
   <store>
     type flowcounter
     count_keys *
+    unit second
   </store>
   <store>
     type reemit # re-emitted messages are not absorbed by <match **>

data/fluent-plugin-reemit.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-reemit"
-  gem.version     = "0.1.0"
+  gem.version     = "0.2.0"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-reemit"

data/lib/fluent/plugin/out_reemit.rb

@@ -70,21 +70,29 @@ module Fluent
       end
 
       def find(tag)
+        # we want to reemit to the next match after this reemit
+        # this avoids reemiting back to an earlier match that
+        # itself did a reemit to the current match that is reemitting.
         pipeline = nil
+        found_reemit = false
         @match_rules.each_with_index { |rule, i|
           # if rule.match?(tag) # this is the original
-          if rule.match?(tag) and !@reemit.included?(rule.collector)
-            if rule.collector.is_a?(Filter)
-              pipeline ||= Pipeline.new
-              pipeline.add_filter(rule.collector)
-            else
-              if pipeline
-                pipeline.set_output(rule.collector)
+          if rule.match?(tag)
+            if found_reemit && !@reemit.included?(rule.collector)
+              if rule.collector.is_a?(Filter)
+                pipeline ||= Pipeline.new
+                pipeline.add_filter(rule.collector)
               else
-                # Use Output directly when filter is not matched
-                pipeline = rule.collector
+                if pipeline
+                  pipeline.set_output(rule.collector)
+                else
+                  # Use Output directly when filter is not matched
+                  pipeline = rule.collector
+                end
+                return pipeline
               end
-              return pipeline
+            elsif !found_reemit && @reemit.included?(rule.collector)
+              found_reemit = true
             end
           end
         }
@@ -116,8 +124,20 @@ module Fluent
       end
 
       def match(tag)
-        # @matches.find {|m| m.match(tag) } # this is the original
-        @matches.find {|m| m.match(tag) and !@reemit.included?(m.output) }
+        # we want to reemit to the next match after this reemit
+        # this avoids reemiting back to an earlier match that
+        # itself did a reemit to the current match that is reemitting.
+        found_reemit = false
+        @matches.find do |m|
+          if m.match(tag)
+            if found_reemit && !@reemit.included?(m.output)
+              true
+            elsif !found_reemit && @reemit.included?(m.output)
+              found_reemit = true
+              false
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-reemit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -95,6 +95,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- examples/multiple_reemit.conf
 - examples/reemit.conf
 - fluent-plugin-reemit.gemspec
 - lib/fluent/plugin/out_reemit.rb