fluent-plugin-concat 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de57c8cef9f5cf34f1377a0c13081bcadacba217
-  data.tar.gz: 1bab7298400f26e6125887119b244063bda87b15
+  metadata.gz: 7e4fdeffac4ac9291bad2385962da8089760784d
+  data.tar.gz: 17430d2ba4129c6264927485021fd62db942a1af
 SHA512:
-  metadata.gz: 91f133b03a055289ee17ff1436f2a015cdb22a01136f877c902d512f5a951ba008869da181b6f79678b278d6b0fe78902a56e667c69f17f8c6e0130c568f040e
-  data.tar.gz: 42421332420b93482bc6fa31b9968d4dffeb6e0f633c37706813e46499854716a959728be34bc2f82015b373284787e4a13c14c3cb90e0fe649b76f815ea6885
+  metadata.gz: 59d1efd15541072956e7628258acbe0cb60c23b995eb5bd12f4239c17eb5a1d2716e0cc13809d26b1672d0c2be1fb5cb066e1d79bada1481dfd58a734aef9a3a
+  data.tar.gz: 6b88b538cb2650cdbf6d848aa9f2238e5bb1e265422583305a9a8e90b22cade41122f8a7a338e008e9e9f1b8fb639b177754c1547666a26177791d07a9d90cf2

data/.travis.yml

@@ -8,5 +8,4 @@ rvm:
 
 gemfile:
   - Gemfile
-  - gemfiles/fluentd_v0.12.gemfile
   - gemfiles/fluentd_v0.14.gemfile

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "fluentd v0.12" do
-  gem "fluentd", "~> 0.12.0"
-end
-
 appraise "fluentd v0.14" do
   gem "fluentd", "~> 0.14.0"
 end
-

data/NEWS.md

@@ -1,9 +1,5 @@
 # ChangeLog
 
-## v1.0.0
-
-Same as v0.6.2, just bump up version.
-
 ## v0.6.2
 
 ### Fixes

data/fluent-plugin-concat.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-concat"
-  spec.version       = "1.0.0"
+  spec.version       = "2.0.0"
   spec.authors       = ["Kenji Okimoto"]
   spec.email         = ["okimoto@clear-code.com"]
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "fluentd", "~> 0.12.21"
+  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 "test-unit", ">= 3.1.0"

data/lib/fluent/plugin/filter_concat.rb

@@ -1,6 +1,10 @@
-module Fluent
+require 'fluent/plugin/filter'
+
+module Fluent::Plugin
   class ConcatFilter < Filter
-    Plugin.register_filter("concat", self)
+    Fluent::Plugin.register_filter("concat", self)
+
+    helpers :timer
 
     desc "The key for part of multiline log"
     config_param :key, :string, required: true
@@ -35,10 +39,10 @@ module Fluent
       super
 
       if @n_lines && @multiline_start_regexp
-        raise ConfigError, "n_lines and multiline_start_regexp are exclusive"
+        raise Fluent::ConfigError, "n_lines and multiline_start_regexp are exclusive"
       end
       if @n_lines.nil? && @multiline_start_regexp.nil?
-        raise ConfigError, "Either n_lines or multiline_start_regexp is required"
+        raise Fluent::ConfigError, "Either n_lines or multiline_start_regexp is required"
       end
 
       @mode = nil
@@ -57,24 +61,22 @@ module Fluent
     def start
       super
       @finished = false
-      @loop = Coolio::Loop.new
-      timer = TimeoutTimer.new(1, method(:on_timer))
-      @loop.attach(timer)
-      @thread = Thread.new(@loop, &:run)
+      timer_execute(:filter_concat_timer, 1, &method(:on_timer))
     end
 
     def shutdown
       super
       @finished = true
-      @loop.watchers.each(&:detach)
-      @loop.stop
-      @thread.join
       flush_remaining_buffer
     end
 
     def filter_stream(tag, es)
-      new_es = MultiEventStream.new
+      new_es = Fluent::MultiEventStream.new
       es.each do |time, record|
+        if /\Afluent\.(?:trace|debug|info|warn|error|fatal)\z/ =~ tag
+          new_es.add(time, record)
+          next
+        end
         begin
           flushed_es = process(tag, time, record)
           unless flushed_es.empty?
@@ -99,7 +101,7 @@ module Fluent
     end
 
     def process(tag, time, record)
-      new_es = MultiEventStream.new
+      new_es = Fluent::MultiEventStream.new
       if @stream_identity_key
         stream_identity = "#{tag}:#{record[@stream_identity_key]}"
       else
@@ -210,22 +212,11 @@ module Fluent
 
     def handle_timeout_error(tag, time, record, message)
       if @timeout_label
-        label = Engine.root_agent.find_label(@timeout_label)
+        label = Fluent::Engine.root_agent.find_label(@timeout_label)
         label.event_router.emit(tag, time, record)
       else
         router.emit_error_event(tag, time, record, TimeoutError.new(message))
       end
     end
-
-    class TimeoutTimer < Coolio::TimerWatcher
-      def initialize(interval, callback)
-        super(interval, true)
-        @callback = callback
-      end
-
-      def on_timer
-        @callback.call
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-concat
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Kenji Okimoto
@@ -14,16 +14,16 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.21
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.21
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,6 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-concat.gemspec
-- gemfiles/fluentd_v0.12.gemfile
 - gemfiles/fluentd_v0.14.gemfile
 - lib/fluent/plugin/filter_concat.rb
 homepage: https://github.com/okkez/fluent-plugin-concat

data/gemfiles/fluentd_v0.12.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "fluentd", "~> 0.12.0"
-
-gemspec :path => "../"