fluent-plugin-ltsv-parser 0.0.1 → 0.0.2

data/fluent-plugin-ltsv-parser.gemspec

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

data/lib/fluent/plugin/out_ltsv_parser.rb

@@ -1,4 +1,3 @@
-require_relative './parser'
 
 class Fluent::ParserOutput < Fluent::Output
     Fluent::Plugin.register_output('ltsv_parser', self)
@@ -8,8 +7,6 @@ class Fluent::ParserOutput < Fluent::Output
     config_param :filter_in, :string , :default => ""
     config_param :add_prefix, :string ,:default => nil
 
-    attr_reader :parser
-
     def initialize
         super
         require 'time'
@@ -36,12 +33,11 @@ class Fluent::ParserOutput < Fluent::Output
         end
         es.each do |time,record|
             raw_value = record[@key_name]
-            t,values = raw_value ? filter(parse(raw_value)) : [nil,nil]
-            t ||= time
+            values = raw_value ? filter(parse(raw_value)) : nil
 
             r = @reserve_data ? record.merge(values) : values 
             if r
-                Fluent::Engine.emit(tag,t,r)
+                Fluent::Engine.emit(tag,time,r)
             end
         end
 
@@ -54,10 +50,10 @@ class Fluent::ParserOutput < Fluent::Output
         if @filter_in.length > 0 then
             record.select{ |x| @filter_in.include? x } 
         end
-        record
+        nil
     end
 
-    def parse(string)
-        return @parser.parse(string) 
+    def parse(text)
+        return Hash[text.split("\t").map{|p| p.split(":", 2)}]
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ltsv-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -58,7 +58,6 @@ files:
 - Rakefile
 - fluent-plugin-ltsv-parser.gemspec
 - lib/fluent/plugin/out_ltsv_parser.rb
-- lib/fluent/plugin/parser.rb
 homepage: https://github.com/anarcher/fluent-plugin-ltsv-parser
 licenses:
 - APLv2

data/lib/fluent/plugin/parser.rb

@@ -1,67 +0,0 @@
-#
-# This module is copied from fluentd/lib/fluent/parser.rb and
-# fixed not to overwrite 'time' (reserve nil) when time not found in parsed string.
-
-module FluentExt
-  class GenericParser
-    include Fluent::Configurable
-
-    config_param :time_key, :string, :default => 'time'
-    config_param :time_format, :string, :default => nil
-    config_param :time_parse, :bool, :default => true
-
-    attr_accessor :log
-
-    def initialize(logger)
-      super()
-
-      @cache1_key = nil
-      @cache1_time = nil
-      @cache2_key = nil
-      @cache2_time = nil
-
-      @log = logger
-    end
-
-    def parse_time(record)
-      time = nil
-
-      unless @time_parse
-        return time, record
-      end
-
-      if value = record.delete(@time_key)
-        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
-
-      return time, record
-    end
-  end
-
-  class LTSVParser < GenericParser
-    def parse(text)
-      record = Hash[text.split("\t").map{|p| p.split(":", 2)}]
-      return parse_time(record)
-    end
-  end
-
-end