fluent-plugin-tail_path 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7035a9557c7fb34608badc84b8d937c0627f60df
-  data.tar.gz: e16fd13e7436ac50fe1914ca71861e05ee996961
+  metadata.gz: 6c83607c70652fd3de4fbf8b05a283ce1c2dc9b0
+  data.tar.gz: a4c0ce8ca8fbf9a19bfb2af4e7cc10484a75770a
 SHA512:
-  metadata.gz: 656da51399cfd849f7cf66292456ddac9a3ea7d218a8641ca64b88ba679df359b33fd0b29612ca5bd03094e115c224f536af6c95ffcec21d2776891748cd6376
-  data.tar.gz: 0273cb6aa4283e046dedffd45dff24fd5a4f095f328fb04f3f2caed28ebcc4237d235349262d30eb48eaef9479cab226c6fb350b2a8e3439b1146109f44b03a6
+  metadata.gz: 65f3b4ff5fc2cd1852ffce114dba032d46301c584a27a30b1a9c6dec5cca250d061eaf17d4cd5be1546cb8c25aed42cd742bcf3b8b00b5c785e29f2bec6b402c
+  data.tar.gz: c735b9eb28f252b75f814ba063e7143c66804a2403ecd951bb5baea025eee773b32c0a9220bf67d089585e07d9ec74a18c2066ebf01a881e0c936e53f0e373d3

data/.travis.yml

@@ -1,7 +1,11 @@
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.*
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3.0
+before_install:
+  - gem update bundler
 gemfile:
   - Gemfile
-  - "Gemfile.fluentd.lt.0.10.50"
+  - Gemfile.fluentd.v10

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.1.0 (2016/04/10)
+
+Fixes:
+
+* Fix for multiline format for >= v0.12
+
+Changes:
+
+* Drop supports for < v0.10.58 instead
+
 ## 0.0.3 (2015/02/17)
 
 Fixes:

data/{Gemfile.fluentd.lt.0.10.50 → Gemfile.fluentd.v10}

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
 gemspec
-gem 'fluentd', '0.10.49'
+gem 'fluentd', '~> v0.10.0'

data/example/multiline.conf

@@ -0,0 +1,25 @@
+# /tmp/application.log
+# ==firstline
+# foo
+# ==firstline
+# bar
+# ==firstline
+# baz
+
+<source>
+  type tail_path
+  format multiline
+  format_firstline /^==firstline/
+  format1 /^(?<message>.*)/
+  path /tmp/application.log
+  refresh_interval 5
+  # pos_file /tmp/application.pos
+  read_from_head true
+  tag raw.test
+  path_key path
+</source>
+
+<match raw.**>
+  type stdout  
+  log_level trace
+</match>

data/{example.conf → example/singleline.conf}

@@ -1,15 +1,15 @@
 <source>
   type tail_path
   format none
-  path /var/log/fluentd_test.log
-  pos_file /var/log/fluentd_test.pos
-  tag test
+  path /tmp/application.log
+  # pos_file /tmp/application.pos
   rotate_wait 5
   read_from_head true
   refresh_interval 60
   path_key path
+  tag raw.test
 </source>
 
-<match test>
+<match raw.**>
   type stdout
 </match>

data/fluent-plugin-tail_path.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-tail_path"
-  s.version     = "0.0.3"
+  s.version     = "0.1.0"
   s.authors     = ["szhem", "Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-tail_path"
@@ -15,8 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "fluentd", ">= 0.10.45"
+  s.add_runtime_dependency "fluentd", ">= 0.10.58"
   s.add_development_dependency "rake"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "pry-nav"
+  s.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/in_tail_path.rb

@@ -1,83 +1,43 @@
 require 'fluent/plugin/in_tail'
 
 class Fluent::NewTailPathInput < Fluent::NewTailInput
-  Fluent::Plugin.register_input('tail_path', self)
-
-  config_param :path_key, :string, :default => nil
+  class RouterWrap
+    attr_accessor :tail_watcher
 
-  def configure(conf)
-    super
-  end
-
-  if method_defined?(:parse_line) # fluentd < 0.10.50
-
-    # Override to add path field
-    def convert_line_to_event(line, es, tail_watcher)
-      begin
-        line.chomp!  # remove \n
-        time, record = parse_line(line)
-        if time && record
-          record[@path_key] ||= tail_watcher.path unless @path_key.nil? # custom
-          es.add(time, record)
-        else
-          log.warn "pattern not match: #{line.inspect}"
-        end
-      rescue => e
-        log.warn line.dump, :error => e.to_s
-        log.debug_backtrace(e)
-      end
+    def initialize(router, path_key)
+      @router = router
+      @path_key = path_key
+      @tail_watcher = nil
     end
 
-  else # fluentd >= 0.10.50
+    def emit(tag, time, record)
+      record[@path_key] = @tail_watcher.path unless @path_key.nil?
+      @router.emit(tag, time, record)
+    end
 
-    # Override to add path field
-    def convert_line_to_event(line, es, tail_watcher)
-      begin
-        line.chomp!  # remove \n
-        @parser.parse(line) { |time, record|
-          if time && record
-            record[@path_key] ||= tail_watcher.path unless @path_key.nil? # custom
-            es.add(time, record)
-          else
-            log.warn "pattern not match: #{line.inspect}"
-          end
-        }
-      rescue => e
-        log.warn line.dump, :error => e.to_s
-        log.debug_backtrace(e)
-      end
+    def emit_array(tag, array)
+      @router.emit_array(tag, array)
     end
 
+    def emit_stream(tag, es)
+      es.each {|time,record|
+        record[@path_key] = @tail_watcher.path unless @path_key.nil?
+      }
+      @router.emit_stream(tag, es)
+    end
   end
 
-  # Override to pass tail_watcher to convert_line_to_event
-  def parse_singleline(lines, tail_watcher)
-    es = ::Fluent::MultiEventStream.new
-    lines.each { |line|
-      convert_line_to_event(line, es, tail_watcher)
-    }
-    es
+  Fluent::Plugin.register_input('tail_path', self)
+
+  config_param :path_key, :string, :default => nil
+
+  def configure(conf)
+    super
+    @router = RouterWrap.new(@router, @path_key)
   end
 
-  # Override to pass tail_watcher to convert_line_to_event
-  def parse_multilines(lines, tail_watcher)
-    lb = tail_watcher.line_buffer
-    es = ::Fluent::MultiEventStream.new
-    lines.each { |line|
-      if @parser.parser.firstline?(line)
-        if lb
-          convert_line_to_event(lb, es, tail_watcher)
-        end
-        lb = line
-      else
-        if lb.nil?
-          log.warn "got incomplete line before first line from #{tail_watcher.path}: #{lb.inspect}"
-        else
-          lb << line
-        end
-      end
-    }
-    tail_watcher.line_buffer = lb
-    es
+  def receive_lines(lines, tail_watcher)
+    @router.tail_watcher = tail_watcher
+    super
   end
 end

data/test/helper.rb

@@ -12,7 +12,6 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
-require 'fluent/plugin/in_tail_path'
 
 class Test::Unit::TestCase
 end

data/test/in_tail_path.rb

@@ -0,0 +1,8 @@
+require_relative 'helper'
+require 'fluent/plugin/in_tail_path'
+
+class TailPathInputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-tail_path
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - szhem
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.45
+        version: 0.10.58
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.45
+        version: 0.10.58
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -40,21 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
-  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'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,15 +64,16 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.fluentd.lt.0.10.50
+- Gemfile.fluentd.v10
 - LICENSE
 - README.md
 - Rakefile
-- example.conf
+- example/multiline.conf
+- example/singleline.conf
 - fluent-plugin-tail_path.gemspec
 - lib/fluent/plugin/in_tail_path.rb
 - test/helper.rb
-- test/plugin/in_tail_path.rb
+- test/in_tail_path.rb
 homepage: https://github.com/sonots/fluent-plugin-tail_path
 licenses: []
 metadata: {}
@@ -106,10 +93,10 @@ 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 in_tail extension to add `path` field
 test_files:
 - test/helper.rb
-- test/plugin/in_tail_path.rb
+- test/in_tail_path.rb

data/test/plugin/in_tail_path.rb

@@ -1,52 +0,0 @@
-require_relative '../helper'
-
-class TailPathInputTest < Test::Unit::TestCase
-  def setup
-    Fluent::Test.setup
-    FileUtils.rm_rf(TMP_DIR)
-    FileUtils.mkdir_p(TMP_DIR)
-  end
-
-  TMP_DIR = File.dirname(__FILE__) + "/../tmp/tail#{ENV['TEST_ENV_NUMBER']}"
-
-  COMMON_CONFIG = %[
-    path #{TMP_DIR}/tail.txt
-    tag t1
-    rotate_wait 2s
-    pos_file #{TMP_DIR}/tail.pos
-  ]
-  SINGLE_LINE_CONFIG = %[
-    format /(?<message>.*)/
-  ]
-
-  def create_driver(conf = SINGLE_LINE_CONFIG, use_common_conf = true)
-    config = use_common_conf ? COMMON_CONFIG + conf : conf
-    Fluent::Test::InputTestDriver.new(Fluent::NewTailPathInput).configure(config)
-  end
-
-  def test_path_key
-    File.open("#{TMP_DIR}/tail.txt", "w") { |f| }
-
-    d = create_driver(%[
-       path #{TMP_DIR}/tail.txt
-       tag t1
-       format /(?<message>.*)/
-       path_key foobar
-    ], false)
-
-    d.run do
-      sleep 1
-
-      File.open("#{TMP_DIR}/tail.txt", "a") {|f|
-        f.puts "test1"
-        f.puts "test2"
-      }
-      sleep 1
-    end
-
-    emits = d.emits
-    assert_equal(true, emits.length > 0)
-    assert_equal({"message"=>"test1", "foobar"=>"#{TMP_DIR}/tail.txt"}, emits[0][2])
-    assert_equal({"message"=>"test2", "foobar"=>"#{TMP_DIR}/tail.txt"}, emits[1][2])
-  end
-end