fluentd 0.10.23 → 0.10.24

data/ChangeLog

@@ -1,4 +1,11 @@
 
+Release 0.10.24 - 2012/06/28
+
+* TextParser/in_tail: supports 'tsv' and 'csv' preset formats
+* supervisor set FD_CLOEXEC to @wait_daemonize_pipe_w in case the child
+process forked during run_configure
+
+
 Release 0.10.23 - 2012/06/25
 
 * out_exec_filter: show more error messages when child process unexpectedly exited

data/VERSION

@@ -1 +1 @@
-0.10.23
+0.10.24

data/lib/fluent/parser.rb

@@ -90,6 +90,64 @@ class TextParser
     end
   end
 
+  class ValuesParser
+    include Configurable
+
+    config_param :keys, :string
+    config_param :time_key, :string, :default => nil
+    config_param :time_format, :string, :default => nil
+
+    def configure(conf)
+      super
+
+      @keys = @keys.split(",")
+
+      if @time_key && !@keys.include?(@time_key)
+        raise ConfigError, "time_key (#{@time_key.inspect}) is not included in keys (#{@keys.inspect})"
+      end
+
+      if @time_format && !@time_key
+        $log.warn "time_format parameter is ignored because time_key parameter is not set"
+      end
+    end
+
+    def values_map(values)
+      record = Hash[keys.zip(values)]
+
+      if @time_key
+        value = record[@time_key]
+        if @time_format
+          time = Time.strptime(value, @time_format).to_i
+        else
+          time = Time.parse(value).to_i
+        end
+      else
+        time = Engine.now
+      end
+
+      return time, record
+    end
+  end
+
+  class TSVParser < ValuesParser
+    config_param :delimiter, :string, :default => "\t"
+
+    def call(text)
+      return values_map(text.split(@delimiter))
+    end
+  end
+
+  class CSVParser < ValuesParser
+    def initialize
+      super
+      require 'csv'
+    end
+
+    def call(text)
+      return values_map(CSV.parse_line(text))
+    end
+  end
+
   class ApacheParser
     include Configurable
 
@@ -146,6 +204,8 @@ class TextParser
     'apache2' => Proc.new { ApacheParser.new },
     'syslog' => Proc.new { RegexpParser.new(/^(?<time>[^ ]*\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?[^\:]*\: *(?<message>.*)$/, {'time_format'=>"%b %d %H:%M:%S"}) },
     'json' => Proc.new { JSONParser.new },
+    'tsv' => Proc.new { TSVParser.new },
+    'csv' => Proc.new { CSVParser.new },
   }
 
   def self.register_template(name, regexp_or_proc, time_format=nil)

data/lib/fluent/supervisor.rb

@@ -109,6 +109,9 @@ class Supervisor
     @wait_daemonize_pipe_r.close
     @wait_daemonize_pipe_r = nil
 
+    # in case the child process forked during run_configure
+    @wait_daemonize_pipe_w.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+
     Process.setsid
     exit!(0) if fork
     File.umask(0)

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.23'
+VERSION = '0.10.24'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.23
+  version: 0.10.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000Z
+date: 2012-06-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70230576091380 !ruby/object:Gem::Requirement
+  requirement: &70174825287820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70230576091380
+  version_requirements: *70174825287820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70230576090780 !ruby/object:Gem::Requirement
+  requirement: &70174825286900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70230576090780
+  version_requirements: *70174825286900
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70230576090240 !ruby/object:Gem::Requirement
+  requirement: &70174825286020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230576090240
+  version_requirements: *70174825286020
 - !ruby/object:Gem::Dependency
   name: cool.io
-  requirement: &70230576089620 !ruby/object:Gem::Requirement
+  requirement: &70174825279360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70230576089620
+  version_requirements: *70174825279360
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70230576088920 !ruby/object:Gem::Requirement
+  requirement: &70174825278760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70230576088920
+  version_requirements: *70174825278760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70230576088280 !ruby/object:Gem::Requirement
+  requirement: &70174825278280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70230576088280
+  version_requirements: *70174825278280
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70230576087680 !ruby/object:Gem::Requirement
+  requirement: &70174825277720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70230576087680
+  version_requirements: *70174825277720
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70230576087040 !ruby/object:Gem::Requirement
+  requirement: &70174825277040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70230576087040
+  version_requirements: *70174825277040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70230576086400 !ruby/object:Gem::Requirement
+  requirement: &70174825276300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70230576086400
+  version_requirements: *70174825276300
 description: 
 email: frsyuki@gmail.com
 executables: