fluent-plugin-reemit 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de2b0c078c5715c5079548c99f2efbbc838fc881
-  data.tar.gz: 640bf1b9a340eb7fe09af815f65ba145b5dd8318
+  metadata.gz: a6de921463dfbc3f21a5b0d55a073d53341bb7b3
+  data.tar.gz: d220a7ff0f0e46050d9fc820ea3694ac67be422d
 SHA512:
-  metadata.gz: 5cfb6bdd0b00d62162754deb1d1480450389755e57d5f6f6696d59890361578b66c759cc45a04be2414d97154f5c7553f6789b12269f0c970531c672535b9c39
-  data.tar.gz: 9b8b6fdab2004582082c62881064feb5d5cef4517b47534a844c7f8d92bbf56545cbd169d3d05ae60aac0d278ff7ba4ca6a6c11dab168e5bcdeb09ed85b953f3
+  metadata.gz: fba582993fad70f50cab375636349284bd4286838bb8206f08126d7f3e29d27ac0aab169c518f23b0bf8113af7cacbc05c22b07645c7b8b73fe2cb9244d3a461
+  data.tar.gz: 185201f75e424cd764a856563741943ddaf399286feae3aa5924b69e07d199d58c612fd4f2d0f5a61a658162af36072f82fd943b89704d19d76b45f3a0d7643f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.2 (2017/09/15)
+
+Fixes:
+
+* Fix to work with Fluentd v0.14 Filter Plugin
+
 ## 0.3.1 (2017/09/15)
 
 Fixes:

data/examples/reemit_filter.conf

@@ -0,0 +1,23 @@
+<source>
+  type gc_stat
+  emit_interval 1s
+  tag gc_stat
+</source>
+
+<match **>
+  @type copy
+  <store>
+    @type stdout
+  </store>
+  <store>
+    @type reemit
+  </store>
+</match>
+
+<filter **>
+  @type stdout
+</filter>
+
+<match **>
+  @type stdout
+</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.3.1"
+  gem.version     = "0.3.2"
   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

@@ -1,10 +1,19 @@
 require 'fluent/version'
-if Fluent::VERSION > '0.12'
-  require 'fluent/event_router'
-end
 
 module Fluent
   class ReemitOutput < Output
+    major, minor, patch = Fluent::VERSION.split('.').map(&:to_i)
+    if major > 0 || (major == 0 && minor >= 14)
+      require_relative 'out_reemit/v14_event_router'
+      EventRouter = V14EventRouter
+    elsif major == 0 && minor >= 12
+      require_relative 'out_reemit/v12_event_router'
+      EventRouter = V12EventRouter
+    else
+      require_relative 'out_reemit/v10_event_router'
+      EventRouter = V10EventRouter
+    end
+
     Fluent::Plugin.register_output('reemit', self)
 
     # To support log_level option implemented by Fluentd v0.10.43
@@ -15,14 +24,7 @@ module Fluent
     def configure(conf)
       super
 
-      major, minor, patch = Fluent::VERSION.split('.').map(&:to_i)
-      if major > 0 || (major == 0 && minor >= 14)
-        @router = V14EventRouter.new(self)
-      elsif major == 0 && minor >= 12
-        @router = V12EventRouter.new(self)
-      else
-        @router = V10EventRouter.new(self)
-      end
+      @router = EventRouter.new(self)
     end
 
     def start
@@ -49,110 +51,5 @@ module Fluent
         false
       end
     end
-
-    class V12EventRouter
-      def initialize(reemit)
-        @reemit = reemit
-        @event_router = Engine.root_agent.event_router
-        @chain = @event_router.instance_variable_get(:@chain) # only v0.12
-        @emit_error_handler = @event_router.emit_error_handler
-        @match_rules = @event_router.instance_variable_get(:@match_rules)
-        @default_collector = @event_router.default_collector
-        # @match_cache = @event_router.match_cache
-        @match_cache = EventRouter::MatchCache.new # need to use a different cache
-      end
-
-      # copy from fluentd
-      def emit_stream(tag, es)
-        match(tag).emit(tag, es, @chain)
-      rescue => e
-        @emit_error_handler.handle_emits_error(tag, es, e)
-      end
-
-      # copy from fluentd
-      def match(tag)
-        collector = @match_cache.get(tag) {
-          c = find(tag) || @default_collector
-        }
-        collector
-      end
-
-      def find(tag)
-        # We want to reemit messages to the **next** `<match>`
-        pipeline = nil
-        found_reemit = false
-        @match_rules.each_with_index { |rule, i|
-          # if rule.match?(tag) # this is the original
-          if rule.match?(tag)
-            if found_reemit && !@reemit.included?(rule.collector)
-              if rule.collector.is_a?(Filter)
-                pipeline ||= EventRouter::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
-            elsif !found_reemit && @reemit.included?(rule.collector)
-              found_reemit = true
-            end
-          end
-        }
-
-        if pipeline
-          # filter is matched but no match
-          pipeline.set_output(@default_collector)
-          pipeline
-        else
-          nil
-        end
-      end
-    end
-
-    # Almost same as V12EventRouter but it must call #emit_events instead of #emit.
-    class V14EventRouter < V12EventRouter
-      # copy from fluentd
-      def emit_stream(tag, es)
-        match(tag).emit_events(tag, es)
-      rescue => e
-        @emit_error_handler.handle_emits_error(tag, es, e)
-      end
-    end
-
-    class V10EventRouter
-      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
-        target.emit(tag, es)
-      end
-
-      def match(tag)
-        # We want to reemit messages to the **next** `<match>`
-        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
 end

data/lib/fluent/plugin/out_reemit/v10_event_router.rb

@@ -0,0 +1,35 @@
+module Fluent
+  class ReemitOutput < Output
+    class V10EventRouter
+      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
+        target.emit(tag, es)
+      end
+
+      def match(tag)
+        # We want to reemit messages to the **next** `<match>`
+        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
+end

data/lib/fluent/plugin/out_reemit/v12_event_router.rb

@@ -0,0 +1,73 @@
+require 'fluent/filter'
+require 'fluent/event_router'
+
+module Fluent
+  class ReemitOutput < Output
+    class V12EventRouter
+      def filter_class
+        ::Fluent::Filter
+      end
+
+      def initialize(reemit)
+        @reemit = reemit
+        @event_router = Engine.root_agent.event_router
+        @chain = @event_router.instance_variable_get(:@chain) # only v0.12
+        @emit_error_handler = @event_router.emit_error_handler
+        @match_rules = @event_router.instance_variable_get(:@match_rules)
+        @default_collector = @event_router.default_collector
+        # @match_cache = @event_router.match_cache
+        @match_cache = ::Fluent::EventRouter::MatchCache.new # need to use a different cache
+      end
+
+      # copy from fluentd
+      def emit_stream(tag, es)
+        match(tag).emit(tag, es, @chain)
+      rescue => e
+        @emit_error_handler.handle_emits_error(tag, es, e)
+      end
+
+      # copy from fluentd
+      def match(tag)
+        collector = @match_cache.get(tag) {
+          c = find(tag) || @default_collector
+        }
+        collector
+      end
+
+      def find(tag)
+        # We want to reemit messages to the **next** `<match>`
+        pipeline = nil
+        found_reemit = false
+        @match_rules.each_with_index { |rule, i|
+          # if rule.match?(tag) # this is the original
+          if rule.match?(tag)
+            if found_reemit && !@reemit.included?(rule.collector)
+              if rule.collector.is_a?(filter_class)
+                pipeline ||= ::Fluent::EventRouter::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
+            elsif !found_reemit && @reemit.included?(rule.collector)
+              found_reemit = true
+            end
+          end
+        }
+
+        if pipeline
+          # filter is matched but no match
+          pipeline.set_output(@default_collector)
+          pipeline
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fluent/plugin/out_reemit/v14_event_router.rb

@@ -0,0 +1,21 @@
+require_relative 'v12_event_router'
+
+module Fluent
+  class ReemitOutput < Output
+    # Almost same as V12EventRouter but
+    # (1) it must call #emit_events instead of #emit
+    # (2) Filter class is Fluent::Plugin::Filter instead of Fluent::Filter
+    class V14EventRouter < V12EventRouter
+      def filter_class
+        ::Fluent::Plugin::Filter
+      end
+
+      # copy from fluentd
+      def emit_stream(tag, es)
+        match(tag).emit_events(tag, es)
+      rescue => e
+        @emit_error_handler.handle_emits_error(tag, es, e)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-reemit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -112,8 +112,12 @@ files:
 - Rakefile
 - examples/multiple_reemit.conf
 - examples/reemit.conf
+- examples/reemit_filter.conf
 - fluent-plugin-reemit.gemspec
 - lib/fluent/plugin/out_reemit.rb
+- lib/fluent/plugin/out_reemit/v10_event_router.rb
+- lib/fluent/plugin/out_reemit/v12_event_router.rb
+- lib/fluent/plugin/out_reemit/v14_event_router.rb
 - spec/out_reemit_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sonots/fluent-plugin-reemit
@@ -136,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to re-emit messages avoiding infinity match loop