fluentd 0.10.21 → 0.10.22

data/ChangeLog

@@ -1,4 +1,13 @@
 
+Release 0.10.22 - 2012/05/02
+
+* Fixed in_tail and TextParser not to raise "time_format is required" error
+* out_exec_filter: fixed JSONFormatter to add \n at the end of records
+* out_exec_filter: separated {tag_key,time_key,time_format} parameters to
+  {in_,out_}{tag_key,time_key,time_format parameters while keeping
+  compatibility
+
+
 Release 0.10.21 - 2012/05/01
 
 * in_tail and TextParser support 'format json'

data/VERSION

@@ -1 +1 @@
-0.10.21
+0.10.22

data/lib/fluent/parser.rb

@@ -22,7 +22,7 @@ class TextParser
   class RegexpParser
     include Configurable
 
-    config_param :time_format, :string
+    config_param :time_format, :string, :default => nil
 
     def initialize(regexp, conf={})
       super()

data/lib/fluent/plugin/out_exec_filter.rb

@@ -44,6 +44,9 @@ class ExecFilterOutput < BufferedOutput
   config_param :in_keys, :default => [] do |val|
     val.split(',')
   end
+  config_param :in_tag_key, :default => nil
+  config_param :in_time_key, :default => nil
+  config_param :in_time_format, :default => nil
 
   config_param :out_format, :default => :tsv do |val|
     f = SUPPORTED_FORMAT[val]
@@ -53,9 +56,11 @@ class ExecFilterOutput < BufferedOutput
   config_param :out_keys, :default => [] do |val|  # for tsv format
     val.split(',')
   end
+  config_param :out_tag_key, :default => nil
+  config_param :out_time_key, :default => nil
+  config_param :out_time_format, :default => nil
 
   config_param :tag, :string, :default => nil
-  config_param :tag_key, :string, :default => nil
 
   config_param :time_key, :string, :default => nil
   config_param :time_format, :string, :default => nil
@@ -66,6 +71,24 @@ class ExecFilterOutput < BufferedOutput
   config_set_default :flush_interval, 1
 
   def configure(conf)
+    if tag_key = conf['tag_key']
+      # TODO obsoleted?
+      @in_tag_key = tag_key
+      @out_tag_key = tag_key
+    end
+
+    if time_key = conf['time_key']
+      # TODO obsoleted?
+      @in_time_key = time_key
+      @out_time_key = time_key
+    end
+
+    if time_format = conf['time_format']
+      # TODO obsoleted?
+      @in_time_format = time_format
+      @out_time_format = time_format
+    end
+
     super
 
     if localtime = conf['localtime']
@@ -74,20 +97,29 @@ class ExecFilterOutput < BufferedOutput
       @localtime = false
     end
 
-    if !@tag && !@tag_key
-      raise ConfigError, "'tag' or 'tag_key' option is required on exec_filter output"
+    if !@tag && !@out_tag_key
+      raise ConfigError, "'tag' or 'out_tag_key' option is required on exec_filter output"
     end
 
-    if @time_key
-      if @time_format
-        f = @time_format
+    if @in_time_key
+      if f = @in_time_format
         tf = TimeFormatter.new(f, @localtime)
         @time_format_proc = tf.method(:format)
-        @time_parse_proc = Proc.new {|str| Time.strptime(str, f).to_i }
       else
         @time_format_proc = Proc.new {|time| time.to_s }
+      end
+    elsif @in_time_format
+      $log.warn "in_time_format effects nothing when in_time_key is not specified: #{conf}"
+    end
+
+    if @out_time_key
+      if f = @out_time_format
+        @time_parse_proc = Proc.new {|str| Time.strptime(str, f).to_i }
+      else
         @time_parse_proc = Proc.new {|str| str.to_i }
       end
+    elsif @out_time_format
+      $log.warn "out_time_format effects nothing when out_time_key is not specified: #{conf}"
     end
 
     if @remove_prefix
@@ -164,11 +196,11 @@ class ExecFilterOutput < BufferedOutput
     out = ''
 
     es.each {|time,record|
-      if @time_key
-        record[@time_key] = @time_format_proc.call(time)
+      if @in_time_key
+        record[@in_time_key] = @time_format_proc.call(time)
       end
-      if @tag_key
-        record[@tag_key] = tag
+      if @in_tag_key
+        record[@in_tag_key] = tag
       end
       @formatter.call(record, out)
     }
@@ -256,7 +288,7 @@ class ExecFilterOutput < BufferedOutput
 
   class JSONFormatter < Formatter
     def call(record, out)
-      out << Yajl.dump(record)
+      out << Yajl.dump(record) << "\n"
     end
   end
 
@@ -267,13 +299,13 @@ class ExecFilterOutput < BufferedOutput
   end
 
   def on_message(record)
-    if val = record.delete(@time_key)
+    if val = record.delete(@out_time_key)
       time = @time_parse_proc.call(val)
     else
       time = Engine.now
     end
 
-    if val = record.delete(@tag_key)
+    if val = record.delete(@out_tag_key)
       tag = if @add_prefix
               @added_prefix_string + val
             else

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.21'
+VERSION = '0.10.22'
 
 end

data/test/plugin/out_exec_filter.rb

@@ -8,10 +8,11 @@ class ExecFilterOutputTest < Test::Unit::TestCase
 
   CONFIG = %[
     command cat
-    in_keys time,tag,k1
-    out_keys time,tag,k2
+    in_keys time_in,tag,k1
+    out_keys time_out,tag,k2
     tag_key tag
-    time_key time
+    in_time_key time_in
+    out_time_key time_out
     time_format %Y-%m-%d %H:%M:%S
     localtime
     num_children 3
@@ -24,11 +25,14 @@ class ExecFilterOutputTest < Test::Unit::TestCase
   def test_configure
     d = create_driver
 
-    assert_equal ["time","tag","k1"], d.instance.in_keys
-    assert_equal ["time","tag","k2"], d.instance.out_keys
-    assert_equal "tag", d.instance.tag_key
-    assert_equal "time", d.instance.time_key
-    assert_equal "%Y-%m-%d %H:%M:%S", d.instance.time_format
+    assert_equal ["time_in","tag","k1"], d.instance.in_keys
+    assert_equal ["time_out","tag","k2"], d.instance.out_keys
+    assert_equal "tag", d.instance.out_tag_key
+    assert_equal "tag", d.instance.in_tag_key
+    assert_equal "time_in", d.instance.in_time_key
+    assert_equal "time_out", d.instance.out_time_key
+    assert_equal "%Y-%m-%d %H:%M:%S", d.instance.in_time_format
+    assert_equal "%Y-%m-%d %H:%M:%S", d.instance.out_time_format
     assert_equal true, d.instance.localtime
     assert_equal 3, d.instance.num_children
 

data/test/plugin/out_stdout.rb

@@ -14,12 +14,6 @@ class StdoutOutputTest < Test::Unit::TestCase
 
   def test_configure
     d = create_driver
-    assert (not d.instance.autoflush)
-
-    d = create_driver %[
-      autoflush true
-    ]
-    assert d.instance.autoflush
   end
 
   # def test_emit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.21
+  version: 0.10.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000Z
+date: 2012-05-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70301065884780 !ruby/object:Gem::Requirement
+  requirement: &70252881832620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70301065884780
+  version_requirements: *70252881832620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70301065884240 !ruby/object:Gem::Requirement
+  requirement: &70252881832140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70301065884240
+  version_requirements: *70252881832140
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70301065883720 !ruby/object:Gem::Requirement
+  requirement: &70252881831560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301065883720
+  version_requirements: *70252881831560
 - !ruby/object:Gem::Dependency
   name: cool.io
-  requirement: &70301065883120 !ruby/object:Gem::Requirement
+  requirement: &70252881831080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70301065883120
+  version_requirements: *70252881831080
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70301065880180 !ruby/object:Gem::Requirement
+  requirement: &70252881830600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70301065880180
+  version_requirements: *70252881830600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70301065879580 !ruby/object:Gem::Requirement
+  requirement: &70252881830080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70301065879580
+  version_requirements: *70252881830080
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70301065878920 !ruby/object:Gem::Requirement
+  requirement: &70252881829500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70301065878920
+  version_requirements: *70252881829500
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70301065878300 !ruby/object:Gem::Requirement
+  requirement: &70252881828920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70301065878300
+  version_requirements: *70252881828920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70301065877720 !ruby/object:Gem::Requirement
+  requirement: &70252881828380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70301065877720
+  version_requirements: *70252881828380
 description: 
 email: frsyuki@gmail.com
 executables: