fluent-plugin-reemit 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0404160cd5a1c4c5b048ff0dccc853242ed44299
-  data.tar.gz: 1d832c567318c7d268fcc2e7e764a439f1b422fd
+  metadata.gz: 4694b1e10321c8954b685c7d010244e78e7e953d
+  data.tar.gz: 5a1905a04b7fa654df1397cccc19671f0ded31b2
 SHA512:
-  metadata.gz: 182e124f72351c76ef85a86f2ed51a7f50247504f174617120f89eb62a7eba391a457c67f70773b3b0b2cb5c2b6fcb83fccffa56608be371f9813adedd4f809b
-  data.tar.gz: e5c17f6c93b8e74a0c3cfc48cf6c9b9246cd52a04628e9f31fbecbe5e1da8b995af85c46a7bb929364db3edb481a17650f01577107dab983e619d7fd9d611dbf
+  metadata.gz: 5af41dc4e9b4608dedd759c8f2110797c94500b3b9487d31f4921a2b868c0f11fe24c9df54dbc36904fc902ddda4a5db9e9470da3c6803b8fc457921a326802c
+  data.tar.gz: 5a7de06331278710042bfb6379000ba84f2079849c7d4691473edd98ca81a50f84f01137ed9ef5244e4156fa866a940735780fddf47e05f87d12f3837e361c02

data/.gitignore

@@ -3,7 +3,7 @@
 #*
 *~
 .bundle
-Gemfile.lock
+*.lock
 .rbenv-version
 vendor
 doc/*

data/.travis.yml

@@ -1,7 +1,10 @@
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
+  - 2.1.*
+  - 2.2.*
+  - 2.3.0
 gemfile:
   - Gemfile
   - Gemfile.v0.12
+  - Gemfile.v0.10
+before_install:
+  - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.3.0 (2017/09/13)
+
+Enhancements:
+
+* Support v0.14
+
 ## 0.2.1 (2015/08/11)
 
 Fixes:

data/Gemfile.v0.10

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

data/Gemfile.v0.12

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

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.2.1"
+  gem.version     = "0.3.0"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-reemit"
@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "pry-nav"
+  gem.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/out_reemit.rb

@@ -1,4 +1,7 @@
-require 'fluent/event_router'
+require 'fluent/version'
+if Fluent::VERSION > '0.12'
+  require 'fluent/event_router'
+end
 
 module Fluent
   class ReemitOutput < Output
@@ -15,9 +18,14 @@ module Fluent
 
     def start
       super
+      event_router = Engine.instance_variable_get(:@event_router)
       @router =
-        if Engine.instance_variable_get(:@event_router)
-          V12EventRouter.new(self)
+        if event_router
+          if v14?(event_router)
+            V14EventRouter.new(self)
+          else
+            V12EventRouter.new(self)
+          end
         else
           V10Engine.new(self)
         end
@@ -30,6 +38,11 @@ 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
@@ -72,9 +85,8 @@ 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.
+        # We want to reemit messages to the next `<match>` below this `type reemit`
+        # to avoid reemiting back to an above or current `<match>`
         pipeline = nil
         found_reemit = false
         @match_rules.each_with_index { |rule, i|
@@ -109,6 +121,16 @@ module Fluent
       end
     end
 
+    # Almost same as V12EventRouter but it must call #emit_events instead of #emit.
+    class V14EventRouter < V12EventRouter
+      # same
+      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 V10Engine
       def initialize(reemit)
         @reemit = reemit
@@ -126,9 +148,8 @@ module Fluent
       end
 
       def match(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.
+        # We want to reemit messages to the next `<match>` below this `type reemit`
+        # to avoid reemiting back to an above or current `<match>`
         found_reemit = false
         @matches.find do |m|
           if m.match(tag)

data/spec/out_reemit_spec.rb

@@ -1,10 +1,18 @@
 # encoding: UTF-8
 require_relative 'spec_helper'
+require 'fluent/plugin/out_copy'
+if Fluent::VERSION > '0.14'
+  require 'fluent/test/driver/multi_output'
+end
 
 describe Fluent::ReemitOutput do
   before { Fluent::Test.setup }
   def create_driver(config, tag = 'test')
-    Fluent::Test::OutputTestDriver.new(Fluent::CopyOutput, tag).configure(config)
+    if Fluent::VERSION > '0.14'
+      Fluent::Test::Driver::MultiOutput.new(Fluent::Plugin::CopyOutput).configure(config)
+    else
+      Fluent::Test::OutputTestDriver.new(Fluent::CopyOutput, tag).configure(config)
+    end
   end
 
   # THIS TEST IS ABSOLUTELY NOT ENOUGH. INSTEAD, RUN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-reemit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fluentd plugin to re-emit messages avoiding infinity match loop
 email: sonots@gmail.com
 executables: []
@@ -91,6 +105,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.v0.10
 - Gemfile.v0.12
 - LICENSE
 - README.md
@@ -121,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to re-emit messages avoiding infinity match loop