fluent-plugin-parser 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77aa844930416c72ecbe0f6836c6550b2fd6b822
-  data.tar.gz: e1c0b6119d98cd6c2e61cbc45eaeda94326116cb
+  metadata.gz: 2326d0682f48ee2aa993c41114c4b6135cf610e5
+  data.tar.gz: aa40d1f259c0781492004e21a79c64118d5ae2cf
 SHA512:
-  metadata.gz: 44b28f43b84125697f69596c1d308db160c3488b2a599ad150dd3bcdd9cf2c0f69d226bf86099baa13c7e18bd1c2399eac0180cb9c72dad340759b8cfc1596a4
-  data.tar.gz: 3e547b358059d88f59a1484d44e27164043d52fc4f0d3e2254ffbd5f38e61e517206e3bd8eedc79db3e1caf691526f383bf987583ba96cdf018b0025c0bf18ad
+  metadata.gz: 10d523349d0c40468ce83b886e74bcbb2d89d3138cf36d09858c3302d398d67b0114e8b1693407b8fcc774ea9b2114d3b94cc8d560fcd4045a885f62f15d598b
+  data.tar.gz: cc0a2694b738d268faff7bdf3d7da786da0ffd785662ff130da252aa18b3c1cf0e6931b5417dae4047cae5ef5ee34b60163fbf6da26f505f60a6acbb2543aa3f

data/fluent-plugin-parser.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-parser"
-  gem.version       = "0.3.2"
+  gem.version       = "0.3.3"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{fluentd plugin to parse single field, or to combine log structure into single field}

data/lib/fluent/plugin/fixed_parser.rb

@@ -11,6 +11,11 @@ class FluentExt::TextParser
     config_param :time_format, :string, :default => nil
     config_param :time_parse, :bool, :default => true
 
+    @cache1_key = nil
+    @cache1_time = nil
+    @cache2_key = nil
+    @cache2_time = nil
+
     def parse_time(record)
       time = nil
 
@@ -19,15 +24,25 @@ class FluentExt::TextParser
       end
 
       if value = record.delete(@time_key)
-        begin
-          time = if @time_format
-                   Time.strptime(value, @time_format).to_i
-                 else
-                   Time.parse(value).to_i
-                 end
-        rescue TypeError, ArgumentError => e
-          $log.warn "Failed to parse time", :key => @time_key, :value => value
-          record[@time_key] = value
+        if @cache1_key == value
+          time = @cache1_time
+        elsif @cache2_key == value
+          time = @cache2_time
+        else
+          begin
+            time = if @time_format
+                     Time.strptime(value, @time_format).to_i
+                   else
+                     Time.parse(value).to_i
+                   end
+            @cache1_key = @cache2_key
+            @cache1_time = @cache2_time
+            @cache2_key = value
+            @cache2_time = time
+          rescue TypeError, ArgumentError => e
+            $log.warn "Failed to parse time", :key => @time_key, :value => value
+            record[@time_key] = value
+          end
         end
       end
 

data/test/plugin/test_out_parser.rb

@@ -112,9 +112,12 @@ class ParserOutputTest < Test::Unit::TestCase
     d1.run do
       d1.emit({'message' => '12 20120402182059'}, time)
       d1.emit({'message' => '34 20120402182100'}, time)
+      d1.emit({'message' => '56 20120402182100'}, time)
+      d1.emit({'message' => '78 20120402182101'}, time)
+      d1.emit({'message' => '90 20120402182100'}, time)
     end
     emits = d1.emits
-    assert_equal 2, emits.length
+    assert_equal 5, emits.length
 
     first = emits[0]
     assert_equal 'parsed.in', first[0]
@@ -129,6 +132,24 @@ class ParserOutputTest < Test::Unit::TestCase
     assert_equal '3', second[2]['x']
     assert_equal '4', second[2]['y']
 
+    third = emits[2]
+    assert_equal 'parsed.in', third[0]
+    assert_equal Time.parse("2012-04-02 18:21:00").to_i, third[1]
+    assert_equal '5', third[2]['x']
+    assert_equal '6', third[2]['y']
+
+    fourth = emits[3]
+    assert_equal 'parsed.in', fourth[0]
+    assert_equal Time.parse("2012-04-02 18:21:01").to_i, fourth[1]
+    assert_equal '7', fourth[2]['x']
+    assert_equal '8', fourth[2]['y']
+
+    fifth = emits[4]
+    assert_equal 'parsed.in', fifth[0]
+    assert_equal Time.parse("2012-04-02 18:21:00").to_i, fifth[1]
+    assert_equal '9', fifth[2]['x']
+    assert_equal '0', fifth[2]['y']
+
     d2 = create_driver(%[
       tag parsed
       key_name      data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-parser
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake