fluent-plugin-reemit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28e555df53cba5c36b2e18a3ac61c83bdf1b1ede
-  data.tar.gz: 9f2ee252b827c5d47131bd7a5b78fa83d6dca1d7
+  metadata.gz: e813b632ab6a8e9d25674b0797d86e164c0f0dcf
+  data.tar.gz: d9bd28e6b7d18eed818154cf8a6e0305ee662b03
 SHA512:
-  metadata.gz: b586019a20b552fdef247349ffcd6447c647c3dbbd3cb5f0268845efa8ad4f9aa380a43dcc1e5c0af9cbec0dfb253f92d9a633b321c717553eab9a5118e84127
-  data.tar.gz: f0d0a817bc8d0d49ca071f9d9f89164f1ffde2e010c7b3f06a1ca2615e2d2618601926218c53cb0c741391bfc4f7740ef38e97ddc11ac5de0f5df170efe0a977
+  metadata.gz: 2e54b924c5b92305d5a3ef091dd9b479b34612c2451f3da471957e87f346e64df976ed2370fd64216681c8a6beb9e1e77887796451b09bea3edc84129c357726
+  data.tar.gz: 34e643e7411db05b9af1b2f3b1c98d8c35ac14d60f6de187949bbfdcf53e48a5b9e3a253a7cb7b122294bbe489d348c224c1dfaa7b5f30d5cd10c91aaba41be6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.4 (2014/04/04)
+
+Enhancement:
+
+* Support recursive MultiOutput
+
 ## 0.0.3 (2014/02/04)
 
 Enhancement:

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 gemspec
 gem 'fluent-plugin-flowcounter' # for examples
+gem 'pry'
+gem 'pry-nav'

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.0.3"
+  gem.version     = "0.0.4"
   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

@@ -23,8 +23,6 @@ module Fluent
       log.warn "reemit: #{e.class} #{e.message} #{e.backtrace.first}"
     end
 
-    private
-
     # My Engine.emit
     def engine_emit(tag, es)
       target = @match_cache[tag]
@@ -38,11 +36,9 @@ module Fluent
     # My Engine.match
     def engine_match(tag)
       # @matches.find {|m| m.match(tag) } # original Engine.match
-      Engine.matches.find {|m| ignore_self_match(m, tag) }
+      Engine.matches.find {|m| match_without_self(m, tag) }
     end
 
-    # Currently support only
-    #
     # <match foo.bar>
     #   type reemit
     # </match>
@@ -55,10 +51,20 @@ module Fluent
     #     type reemit
     #   </store>
     # </match>
-    def ignore_self_match(m, tag)
-      return false if m.output == self
-      return false if m.output.kind_of?(MultiOutput) and m.output.outputs.include?(self)
+    def match_without_self(m, tag)
+      return false if contain_self?(m.output)
       m.match(tag)
     end
+
+    def contain_self?(output)
+      if output.kind_of?(MultiOutput)
+        output.outputs.each do |o|
+          return true if contain_self?(o)
+        end
+      else
+        return true if output == self
+      end
+      false
+    end
   end
 end

data/spec/out_reemit_spec.rb

@@ -3,5 +3,62 @@ require_relative 'spec_helper'
 
 describe Fluent::ReemitOutput do
   before { Fluent::Test.setup }
-  # There is not test driver which suites
+  def create_driver(config, tag = 'test')
+    Fluent::Test::OutputTestDriver.new(Fluent::CopyOutput, tag).configure(config)
+  end
+
+  describe '#contain_self?' do
+    it 'should contain self' do
+      config = %[
+        <store>
+          type reemit
+        </store>
+        <store>
+          type stdout
+        </store>
+      ]
+      output = create_driver(config).instance
+      reemit = output.outputs.first
+      reemit.contain_self?(output).should be_true
+    end
+
+    it 'should not contain self' do
+      reemit_config = %[
+        <store>
+          type reemit
+        </store>
+        <store>
+          type stdout
+        </store>
+      ]
+      noreemit_config = %[
+        <store>
+          type stdout
+        </store>
+      ]
+      reemit = create_driver(reemit_config).instance.outputs.first
+      output = create_driver(noreemit_config).instance
+      reemit.contain_self?(output).should be_false
+    end
+
+    it 'should contain self in deep' do
+      config = %[
+        <store>
+          type stdout
+        </store>
+        <store>
+          type copy
+          <store>
+            type stdout
+          </store>
+          <store>
+            type reemit
+          </store>
+        </store>
+      ]
+      output = create_driver(config).instance
+      reemit = output.outputs[1].outputs[1]
+      reemit.contain_self?(output).should be_true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-reemit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd