fluent-plugin-concat 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4fdeffac4ac9291bad2385962da8089760784d
-  data.tar.gz: 17430d2ba4129c6264927485021fd62db942a1af
+  metadata.gz: e28946b6269c174d18d658dbee72cb77e74ebb2d
+  data.tar.gz: e5e0ff498b6594a702c9e2413d77be387488fcc4
 SHA512:
-  metadata.gz: 59d1efd15541072956e7628258acbe0cb60c23b995eb5bd12f4239c17eb5a1d2716e0cc13809d26b1672d0c2be1fb5cb066e1d79bada1481dfd58a734aef9a3a
-  data.tar.gz: 6b88b538cb2650cdbf6d848aa9f2238e5bb1e265422583305a9a8e90b22cade41122f8a7a338e008e9e9f1b8fb639b177754c1547666a26177791d07a9d90cf2
+  metadata.gz: 135d4d421b3e4f3960416825d7c3f42f556d55fb51e0c60a4ba4f2c5e9a759a24a475d3e139affe1cfaaad21fa63e11efd9be6309442e055f92f12ccbfe57903
+  data.tar.gz: 906220dbab6d6b9912654614efe0681ae00538a46d86d51f2c7db51af4304d63e128086bdeee623933e982a247e3be8adabe6ab137e4477d3e8702bfaa023957

data/.travis.yml

@@ -2,9 +2,10 @@ sudo: false
 language: ruby
 
 rvm:
-  - 2.1.8
+  - 2.1.9
   - 2.2.5
-  - 2.3.1
+  - 2.3.3
+  - 2.4.0
 
 gemfile:
   - Gemfile

data/README.md

@@ -1,6 +1,6 @@
 # fluent-plugin-concat
 
-[![Build Status](https://travis-ci.org/okkez/fluent-plugin-concat.svg?branch=master)](https://travis-ci.org/okkez/fluent-plugin-concat)
+[![Build Status](https://travis-ci.org/fluent-plugins-nursery/fluent-plugin-concat.svg?branch=master)](https://travis-ci.org/fluent-plugins-nursery/fluent-plugin-concat)
 
 Fluentd Filter plugin to concatenate multiline log separated in multiple events.
 

data/fluent-plugin-concat.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-concat"
-  spec.version       = "2.0.0"
+  spec.version       = "2.0.1"
   spec.authors       = ["Kenji Okimoto"]
   spec.email         = ["okimoto@clear-code.com"]
 
   spec.summary       = "Fluentd Filter plugin to concat multiple event messages"
   spec.description   = "Fluentd Filter plugin to concat multiple event messages"
-  spec.homepage      = "https://github.com/okkez/fluent-plugin-concat"
+  spec.homepage      = "https://github.com/fluent-plugins-nursery/fluent-plugin-concat"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "fluentd", ">= 0.14.0"
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit", ">= 3.1.0"
   spec.add_development_dependency "test-unit-rr"
   spec.add_development_dependency "appraisal"

data/lib/fluent/plugin/filter_concat.rb

@@ -4,10 +4,10 @@ module Fluent::Plugin
   class ConcatFilter < Filter
     Fluent::Plugin.register_filter("concat", self)
 
-    helpers :timer
+    helpers :timer, :event_emitter
 
     desc "The key for part of multiline log"
-    config_param :key, :string, required: true
+    config_param :key, :string
     desc "The separator of lines"
     config_param :separator, :string, default: "\n"
     desc "The number of lines"
@@ -65,9 +65,9 @@ module Fluent::Plugin
     end
 
     def shutdown
-      super
       @finished = true
       flush_remaining_buffer
+      super
     end
 
     def filter_stream(tag, es)
@@ -212,8 +212,8 @@ module Fluent::Plugin
 
     def handle_timeout_error(tag, time, record, message)
       if @timeout_label
-        label = Fluent::Engine.root_agent.find_label(@timeout_label)
-        label.event_router.emit(tag, time, record)
+        event_router = event_emitter_router(@timeout_label)
+        event_router.emit(tag, time, record)
       else
         router.emit_error_event(tag, time, record, TimeoutError.new(message))
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-concat
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Kenji Okimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ files:
 - fluent-plugin-concat.gemspec
 - gemfiles/fluentd_v0.14.gemfile
 - lib/fluent/plugin/filter_concat.rb
-homepage: https://github.com/okkez/fluent-plugin-concat
+homepage: https://github.com/fluent-plugins-nursery/fluent-plugin-concat
 licenses:
 - MIT
 metadata: {}
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Fluentd Filter plugin to concat multiple event messages