fluent-plugin-reemit 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84d14647bf82812c2048c86f59520de45e76f94e
-  data.tar.gz: 43bd565f6221c20c685a54f2465eea6a12d39dec
+  metadata.gz: 92a5d08ac9438d11190b6bfd139a5bbb12cc501f
+  data.tar.gz: 44a90ef06dbf130eac54648ea03d8ca2e9c9e83f
 SHA512:
-  metadata.gz: 647d70fc30ff282b66c2a940781ab33874d8bd6ad481f98b57cd7bfeca86be0000123a08898bb9d3abbe85ed95adebdef79a24c50ccfc9e588354c92515614aa
-  data.tar.gz: cbf229dcf1719638e907c50847e05d6ae850b234d7449a95ac197160572de41e3d3390b8ecb53a586940b10382e451d5c5a06e2b4f3d1681f6525bf989252242
+  metadata.gz: d92f99ad94d1d5c8b3a14b460054908e73cce1a409abb0b76943b6bad656204cae444f7900390e9f70e2aed154cb44cb6a3d259e03c7e837df8cb9e96b451860
+  data.tar.gz: 0d032e86c8f337b3280fdd4933eda7ccabbb87181196627c971da9807f22d5ab6daf85c7700da107f67ad67f1a113290cba5eb03f371c981b4926312325a3c10

data/.travis.yml

@@ -4,3 +4,4 @@ rvm:
   - 2.0.0
 gemfile:
   - Gemfile
+  - Gemfile.v0.12

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.0 (2014/11/26)
+
+Changes:
+
+* Support fluentd v0.12.pre
+
 ## 0.0.5 (2014/09/22)
 
 Changes:

data/Gemfile.v0.12

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

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.5"
+  gem.version     = "0.1.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

@@ -7,64 +7,118 @@ module Fluent
       define_method("log") { $log }
     end
 
-    def initialize
+    def configure(conf)
       super
-      @match_cache = {}
     end
 
-    def configure(conf)
+    def start
       super
+      @router =
+        if Engine.instance_variable_get(:@event_router)
+          V12EventRouter.new(self)
+        else
+          V10Engine.new(self)
+        end
     end
 
     def emit(tag, es, chain)
-      engine_emit(tag, es)
+      @router.emit_stream(tag, es)
       chain.next
     rescue => e
       log.warn "reemit: #{e.class} #{e.message} #{e.backtrace.first}"
     end
 
-    # My Engine.emit
-    def engine_emit(tag, es)
-      target = @match_cache[tag]
-      unless target
-        target = engine_match(tag) || Fluent::EngineClass::NoMatchMatch.new
-        @match_cache[tag] = target
+    def included?(collector)
+      return false if collector.nil?
+      if collector == self
+        true
+      elsif collector.respond_to?(:outputs) # MultiOutput
+        collector.outputs.each do |o|
+          return true if self.included?(o)
+        end
+        false
+      else
+        false
       end
-      target.emit(tag, es)
     end
 
-    # My Engine.match
-    def engine_match(tag)
-      # @matches.find {|m| m.match(tag) } # original Engine.match
-      Engine.matches.find {|m| match_without_self(m, tag) }
-    end
+    class V12EventRouter
+      def initialize(reemit)
+        @reemit = reemit
+        @event_router = Engine.instance_variable_get(:@event_router)
+        @chain = @event_router.instance_variable_get(:@chain)
+        @emit_error_handler = @event_router.instance_variable_get(:@emit_error_handler)
+        @match_rules = @event_router.instance_variable_get(:@match_rules)
+        @default_collector = @event_router.instance_variable_get(:@default_collector)
+        # @match_cache = @event_router.instance_variable_get(:@match_cache)
+        @match_cache = EventRouter::MatchCache.new # need to use a different cache
+      end
 
-    # <match foo.bar>
-    #   type reemit
-    # </match>
-    #
-    # and
-    #
-    # <match foo.bar>
-    #   type copy
-    #   <store>
-    #     type reemit
-    #   </store>
-    # </match>
-    def match_without_self(m, tag)
-      return false if contain_self?(m.output)
-      m.match(tag)
+      # same
+      def emit_stream(tag, es)
+        match(tag).emit(tag, es, @chain)
+      rescue => e
+        @emit_error_handler.handle_emits_error(tag, es, e)
+      end
+
+      # same
+      def match(tag)
+        collector = @match_cache.get(tag) {
+          c = find(tag) || @default_collector
+        }
+        collector
+      end
+
+      def find(tag)
+        pipeline = nil
+        @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)
+              else
+                # Use Output directly when filter is not matched
+                pipeline = rule.collector
+              end
+              return pipeline
+            end
+          end
+        }
+
+        if pipeline
+          # filter is matched but no match
+          pipeline.set_output(@default_collector)
+          pipeline
+        else
+          nil
+        end
+      end
     end
 
-    def contain_self?(output)
-      if output.kind_of?(MultiOutput)
-        output.outputs.each do |o|
-          return true if contain_self?(o)
+    class V10Engine
+      def initialize(reemit)
+        @reemit = reemit
+        @matches = Engine.matches
+        @match_cache = {}
+      end
+
+      def emit_stream(tag, es)
+        target = @match_cache[tag]
+        unless target
+          target = match(tag) || Fluent::EngineClass::NoMatchMatch.new
+          @match_cache[tag] = target
         end
-      else
-        return true if output == self
+        target.emit(tag, es)
+      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) }
       end
-      false
     end
   end
 end

data/spec/out_reemit_spec.rb

@@ -7,8 +7,10 @@ describe Fluent::ReemitOutput do
     Fluent::Test::OutputTestDriver.new(Fluent::CopyOutput, tag).configure(config)
   end
 
-  describe '#contain_self?' do
-    it 'should contain self' do
+  # THIS TEST IS ABSOLUTELY NOT ENOUGH. INSTEAD, RUN
+  # bundle exec fluentd -c examples/reemit.conf
+  describe '#included?' do
+    it 'should be included' do
       config = %[
         <store>
           type reemit
@@ -19,10 +21,10 @@ describe Fluent::ReemitOutput do
       ]
       output = create_driver(config).instance
       reemit = output.outputs.first
-      reemit.contain_self?(output).should be_truthy
+      expect(reemit.included?(output)).to be_truthy
     end
 
-    it 'should not contain self' do
+    it 'should not be included' do
       reemit_config = %[
         <store>
           type reemit
@@ -38,10 +40,10 @@ describe Fluent::ReemitOutput do
       ]
       reemit = create_driver(reemit_config).instance.outputs.first
       output = create_driver(noreemit_config).instance
-      reemit.contain_self?(output).should be_falsy
+      expect(reemit.included?(output)).to be_falsy
     end
 
-    it 'should contain self in deep' do
+    it 'should be included in deep' do
       config = %[
         <store>
           type stdout
@@ -58,7 +60,7 @@ describe Fluent::ReemitOutput do
       ]
       output = create_driver(config).instance
       reemit = output.outputs[1].outputs[1]
-      reemit.contain_self?(output).should be_truthy
+      expect(reemit.included?(output)).to be_truthy
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-reemit
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -91,6 +91,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.v0.12
 - LICENSE
 - README.md
 - Rakefile