fluent-plugin-multiline-parser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc113265be221c413cc51a40ad56cbcc250d1217
-  data.tar.gz: 4457cc48b3171e59bd0e72bf321d7469449d9c96
+  metadata.gz: faba87e84857d3ce484bade7c89f79f05ecb1d6f
+  data.tar.gz: 0d0e93368d60621bf7a9600c8ef3bc5d09817055
 SHA512:
-  metadata.gz: 18e184ce2b0bbf9cd07780908fd645272907d05d34941c6ba352e13a2274a3727e912f8e4ae9c917820006248d6d393a0c83901602e05cd3ff036136aefce29f
-  data.tar.gz: 077f86f130c5799e0cb2de54d0cc8112a498625931938a5531592d4a226795fb03c084f8b81acf37024bcc677791a55a7a64292e4e2810457601520fc155307b
+  metadata.gz: 48d08b204746d1dc17004bd98b14faf302d7c6468b55512dbbf17b8984e7c3aa73b35a76687548593fcbcab284651d7663770e114683018af46d7f850ef9976c
+  data.tar.gz: f7ebc6f16416346807f0f536c9c7c7a426468b67906ab157dc1126465d1db525d81ed26059fa3c87c689b949d6abb380e26ab2d1336c97d8b62765e1191822fa

data/fluent-plugin-multiline-parser.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-multiline-parser"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["Jerry Zhou"]
   gem.email         = ["quicksort@outlook.com"]
   gem.description   = %q{fluentd plugin to parse single field, or to combine log structure into single field, and support multiline format}

data/lib/fluent/plugin/filter_parser.rb

@@ -30,7 +30,7 @@ class Fluent::ParserFilter < Fluent::Filter
                          method(:parse_singleline)
                        end
 
-    @parser = Fluent::Plugin.new_parser(conf['format'])
+    @parser = Fluent::TextParser.new
     @parser.estimate_current_event = false
     @parser.configure(conf)
     if !@time_parse && @parser.parser.respond_to?("time_key=".to_sym)
@@ -44,7 +44,11 @@ class Fluent::ParserFilter < Fluent::Filter
     line.chomp!
     @parser.parse(line) do |t,values|
       if values
-        t ||= time
+        if @time_parse
+          t ||= time
+        else
+          t = time
+        end
         r = handle_parsed(tag, record, t, values)
         new_es.add(t, r)
       else
@@ -61,7 +65,7 @@ class Fluent::ParserFilter < Fluent::Filter
 
   def parse_multilines(tag, time, record, line, new_es, es)
     if @@lines_buffer.has_key?(tag)
-      matches = @parser.firstline?(line)
+      matches = @parser.parser.firstline?(line)
       if matches
         index = line.index(matches[0])
         if index && index > 0

data/lib/fluent/plugin/out_parser.rb

@@ -52,7 +52,7 @@ class Fluent::ParserOutput < Fluent::Output
                          method(:parse_singleline)
                        end
 
-    @parser = Fluent::Plugin.new_parser(conf['format'])
+    @parser = Fluent::TextParser.new
     @parser.estimate_current_event = false
     @parser.configure(conf)
     if !@time_parse && @parser.parser.respond_to?("time_key=".to_sym)
@@ -66,7 +66,11 @@ class Fluent::ParserOutput < Fluent::Output
     line.chomp!
     @parser.parse(line) do |t,values|
       if values
-        t ||= time
+        if @time_parse
+          t ||= time
+        else
+          t = time
+        end
         r = handle_parsed(tag, record, t, values)
       else
         log.warn "pattern not match with data #{tag} '#{line}'" unless @suppress_parse_error_log
@@ -80,7 +84,7 @@ class Fluent::ParserOutput < Fluent::Output
 
   def parse_multilines(tag, time, record, line)
     if @@lines_buffer.has_key?(tag)
-      matches = @parser.firstline?(line)
+      matches = @parser.parser.firstline?(line)
       if matches
         index = line.index(matches[0])
         if index && index > 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-multiline-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jerry Zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit