fluent-plugin-tail-multiline 0.1.4 → 0.1.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmRjNjI2YTUyZjE4NDRmNjg1NGI4YzNlOWJkNmZkOWE0M2YwNDA5YQ==
+  data.tar.gz: !binary |-
+    NWU0YzczOTg2ZWFiY2EzYmMxZTE3ZDUxZDc0M2M4YzVmM2M5Yjk2MQ==
+SHA512:
+  metadata.gz: !binary |-
+    NjJjNjE4M2E3NGQ5NDM4ZjBlYjZkMjk5ZGE1MGI0Y2NmOTc5MmQ2MDAzNjZh
+    MTZiYjFkY2M3ZDU1NjlkNGJhNGFiZWFjODY3ZTY1N2FhZjcxMjBiYzJmNzE2
+    ZTI0ZWUxYmU1ZGJlOGMxN2M0MDRlMzM4MTU0MWJiNDhiZGNjMTE=
+  data.tar.gz: !binary |-
+    ZjBmYjk3ODQ3MzUwMTY5MzhjZjE3ZGVhOGRhY2MwMGEyYmM2MTYzNTI1Y2Fh
+    NzBlOGZhMGMwYzYzMjliZjJmOTNmNzNlYTE1ODg0ZTk0OWQ1ZGY4YzQ3N2Zj
+    MDZjMzZjZTk3YjIxMDM3OGFhODE2ZWNjNTM3MzU2ZTRmODNmYjA=

data/fluent-plugin-tail-multiline.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-tail-multiline"
-  gem.version       = "0.1.4"
+  gem.version       = "0.1.5"
   gem.authors       = ["Tomohisa Ota"]
   gem.email         = ["tomohisa.ota+github@gmail.com"]
   gem.description   = "Extend tail plugin to support log with multiple line"

data/lib/fluent/plugin/in_tail_multiline.rb

@@ -20,11 +20,7 @@ module Fluent
           raise ConfigError, "Invalid regexp in format '#{format[1..-2]}': #{$!}"
         end
 
-        @parser = RegexpParser.new(@regex)
-
-        if @parser.respond_to?(:configure)
-          @parser.configure(conf)
-        end
+        @parser = RegexpParser.new(@regex, conf)
 
         format_firstline = conf['format_firstline']
         if format_firstline

data/test/plugin/test_in_tail_multiline.rb

@@ -19,6 +19,70 @@ class TailMultilineInputTest < Test::Unit::TestCase
     Fluent::Test::InputTestDriver.new(Fluent::TailMultilineInput).configure(conf)
   end
   
+  def test_emit_time_format
+    tmpFile = Tempfile.new("in_tail_multiline-")
+    begin
+      d = create_driver %[
+        path #{tmpFile.path}
+        tag test
+        format /^(?<time>[^ ]* [^ ]*) [s|f] (?<message>.*)/
+        time_format %m-%d-%Y %H:%M:%S
+      ]
+      d.run do
+        File.open(tmpFile.path, "w") {|f|
+          f.puts "12-24-2012 10:20:30 f test1"
+        }
+        sleep 1
+      end
+
+      emits = d.emits
+      assert_equal(true, emits.length > 0)
+      assert_equal({"message"=>"test1"}, emits[0][2])
+
+      t = Time.at(emits[0][1])
+      assert_equal(2012, t.year)
+      assert_equal(12, t.month)
+      assert_equal(24, t.day)
+      assert_equal(10, t.hour)
+      assert_equal(20, t.min)
+      assert_equal(30, t.sec)
+    ensure
+      tmpFile.close(true)
+    end
+  end
+
+  def test_emit_custom_time_format
+    tmpFile = Tempfile.new("in_tail_multiline-")
+    begin
+      d = create_driver %[
+        path #{tmpFile.path}
+        tag test
+        format /^(?<time>[^ ]* [^ ]*) [s|f] (?<message>.*)/
+        time_format %m-%d %H:%M:%S
+      ]
+      d.run do
+        File.open(tmpFile.path, "w") {|f|
+          f.puts "12-24 10:20:30 f test1"
+        }
+        sleep 1
+      end
+
+      emits = d.emits
+      assert_equal(true, emits.length > 0)
+      assert_equal({"message"=>"test1"}, emits[0][2])
+
+      t = Time.at(emits[0][1])
+      assert_equal(Time.new.year, t.year)
+      assert_equal(12, t.month)
+      assert_equal(24, t.day)
+      assert_equal(10, t.hour)
+      assert_equal(20, t.min)
+      assert_equal(30, t.sec)
+    ensure
+      tmpFile.close(true)
+    end
+  end
+
   def test_emit_no_additional_option
     tmpFile = Tempfile.new("in_tail_multiline-")
     begin

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-tail-multiline
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Tomohisa Ota
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -45,27 +42,26 @@ files:
 - test/plugin/test_in_tail_multiline.rb
 homepage: http://github.com/tomohisaota/fluent-plugin-tail-multiline
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extend tail plugin to support log with multiple line
 test_files:
 - test/helper.rb