fluent-plugin-reemit 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4694b1e10321c8954b685c7d010244e78e7e953d
-  data.tar.gz: 5a1905a04b7fa654df1397cccc19671f0ded31b2
+  metadata.gz: de2b0c078c5715c5079548c99f2efbbc838fc881
+  data.tar.gz: 640bf1b9a340eb7fe09af815f65ba145b5dd8318
 SHA512:
-  metadata.gz: 5af41dc4e9b4608dedd759c8f2110797c94500b3b9487d31f4921a2b868c0f11fe24c9df54dbc36904fc902ddda4a5db9e9470da3c6803b8fc457921a326802c
-  data.tar.gz: 5a7de06331278710042bfb6379000ba84f2079849c7d4691473edd98ca81a50f84f01137ed9ef5244e4156fa866a940735780fddf47e05f87d12f3837e361c02
+  metadata.gz: 5cfb6bdd0b00d62162754deb1d1480450389755e57d5f6f6696d59890361578b66c759cc45a04be2414d97154f5c7553f6789b12269f0c970531c672535b9c39
+  data.tar.gz: 9b8b6fdab2004582082c62881064feb5d5cef4517b47534a844c7f8d92bbf56545cbd169d3d05ae60aac0d278ff7ba4ca6a6c11dab168e5bcdeb09ed85b953f3

data/CHANGELOG.md

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

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.0"
+  gem.version     = "0.3.1"
   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

@@ -14,21 +14,19 @@ 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
     end
 
     def start
       super
-      event_router = Engine.instance_variable_get(:@event_router)
-      @router =
-        if event_router
-          if v14?(event_router)
-            V14EventRouter.new(self)
-          else
-            V12EventRouter.new(self)
-          end
-        else
-          V10Engine.new(self)
-        end
     end
 
     def emit(tag, es, chain)
@@ -38,11 +36,6 @@ module Fluent
       log.warn "reemit: #{e.class} #{e.message} #{e.backtrace.first}"
     end
 
-    def v14?(event_router)
-      default_collector = event_router.instance_variable_get(:@default_collector)
-      default_collector.respond_to?(:emit_events)
-    end
-
     def included?(collector)
       return false if collector.nil?
       if collector == self
@@ -60,23 +53,23 @@ module Fluent
     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)
+        @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.instance_variable_get(:@default_collector)
-        # @match_cache = @event_router.instance_variable_get(:@match_cache)
+        @default_collector = @event_router.default_collector
+        # @match_cache = @event_router.match_cache
         @match_cache = EventRouter::MatchCache.new # need to use a different cache
       end
 
-      # same
+      # 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
 
-      # same
+      # copy from fluentd
       def match(tag)
         collector = @match_cache.get(tag) {
           c = find(tag) || @default_collector
@@ -85,8 +78,7 @@ module Fluent
       end
 
       def find(tag)
-        # We want to reemit messages to the next `<match>` below this `type reemit`
-        # to avoid reemiting back to an above or current `<match>`
+        # We want to reemit messages to the **next** `<match>`
         pipeline = nil
         found_reemit = false
         @match_rules.each_with_index { |rule, i|
@@ -123,7 +115,7 @@ module Fluent
 
     # Almost same as V12EventRouter but it must call #emit_events instead of #emit.
     class V14EventRouter < V12EventRouter
-      # same
+      # copy from fluentd
       def emit_stream(tag, es)
         match(tag).emit_events(tag, es)
       rescue => e
@@ -131,7 +123,7 @@ module Fluent
       end
     end
 
-    class V10Engine
+    class V10EventRouter
       def initialize(reemit)
         @reemit = reemit
         @matches = Engine.matches
@@ -148,8 +140,7 @@ module Fluent
       end
 
       def match(tag)
-        # We want to reemit messages to the next `<match>` below this `type reemit`
-        # to avoid reemiting back to an above or current `<match>`
+        # We want to reemit messages to the **next** `<match>`
         found_reemit = false
         @matches.find do |m|
           if m.match(tag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-reemit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to re-emit messages avoiding infinity match loop