fluentd 0.10.7 → 0.10.8

data/lib/fluent/test/output_test.rb

@@ -87,7 +87,54 @@ class BufferedOutputTestDriver < InputTestDriver
   end
 end
 
+class TimeSlicedOutputTestDriver < InputTestDriver
+  def initialize(klass, tag='test', &block)
+    super(klass, &block)
+    @entries = {}
+    @expected_buffer = nil
+    @tag = tag
+  end
 
-end
+  attr_accessor :tag
+
+  def emit(record, time=Time.now)
+    slicer = @instance.instance_eval{@time_slicer}
+    key = slicer.call(time.to_i)
+    @entries[key] = [] unless @entries.has_key?(key)
+    @entries[key] << [time.to_i, record]
+    self
+  end
+
+  def expect_format(str)
+    (@expected_buffer ||= '') << str
+  end
+
+  def run(&block)
+    result = []
+    super {
+      @entries.keys.each {|key|
+        es = ArrayEventStream.new(@entries[key])
+        @instance.emit(@tag, es, NullOutputChain.instance)
+      }
+
+      block.call if block
+
+      chunks = @instance.instance_eval {
+        @buffer.instance_eval {
+          chunks = []
+          @map.keys.each {|key|
+            chunks.push(@map.delete(key))
+          }
+          chunks
+        }
+      }
+      chunks.each { |chunk|
+        result.push(@instance.write(chunk))
+      }
+    }
+    result
+  end
 end
 
+end
+end

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.7'
+VERSION = '0.10.8'
 
 end

data/test/config.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
-
 require 'fluent/config'
+require 'fluent/supervisor'
+require 'fluent/load'
 require 'fileutils'
 
 class ConfigTest < Test::Unit::TestCase
@@ -8,7 +9,7 @@ class ConfigTest < Test::Unit::TestCase
 
   TMP_DIR = File.dirname(__FILE__) + "/tmp"
 
-  def test_include
+  def prepare_config
     write_config "#{TMP_DIR}/config_test_1.conf", %[
       k1 root_config
       include dir/config_test_2.conf  #
@@ -39,6 +40,10 @@ class ConfigTest < Test::Unit::TestCase
       k7 wildcard_include_2
     ]
 
+  end
+
+  def test_include
+    prepare_config
     c = Config.read("#{TMP_DIR}/config_test_1.conf")
     assert_equal 'root_config', c['k1']
     assert_equal 'relative_path_include', c['k2']
@@ -50,11 +55,23 @@ class ConfigTest < Test::Unit::TestCase
     assert_equal 'elem', c.elements.first.name
     assert_equal 'name', c.elements.first.arg
     assert_equal 'normal_parameter', c.elements.first['include']
+    
   end
 
   def write_config(path, data)
     FileUtils.mkdir_p(File.dirname(path))
     File.open(path, "w") {|f| f.write data }
   end
+
+  def test_inline
+    prepare_config 
+    opts = {
+      :config_path => "#{TMP_DIR}/config_test_1.conf",
+      :inline_config => "<source>\n  type http\n  port 2222\n </source>"
+    }
+    assert_nothing_raised do
+      Fluent::Supervisor.new(opts)
+    end  
+  end
 end
 

data/test/helper.rb

@@ -1,6 +1,9 @@
 require 'test/unit'
 require 'fileutils'
+require 'fluent/log'
 
 class Test::Unit::TestCase
 end
 
+$log = Fluent::Log.new(STDOUT, Fluent::Log::LEVEL_WARN)
+

data/test/mixin.rb

@@ -0,0 +1,232 @@
+require 'helper'
+require 'fluent/mixin'
+
+#class MixinTest < Test::Unit::TestCase
+#  class MixinOutputTester < Fluent::BufferedOutput
+#    Fluent::Plugin.register_output('mixintest', self)
+#    include Fluent::PlainTextFormatterMixin
+#    def configure(conf)
+#      super
+#    end
+#    def write(chunk)
+#      chunk.read
+#    end
+#  end
+#
+#  def create_driver(conf='')
+#    Fluent::Test::BufferedOutputTestDriver.new(MixinOutputTester).configure(conf)
+#  end
+#
+#  def test_default_config
+#    d = create_driver
+#    assert_equal true, d.instance.output_include_time
+#    assert_equal true, d.instance.output_include_tag
+#    assert_equal 'json', d.instance.output_data_type
+#    assert_equal "\t", d.instance.output_field_separator
+#    assert_equal true, d.instance.output_add_newline
+#    assert_equal nil, d.instance.instance_eval{@localtime}
+#
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\t{"foo":1,"bar":501}\n2011-11-29T12:02:50Z\ttest\t{"foo":2,"bar":502}\n], text
+#  end
+#
+#  def test_timezone
+#    d = create_driver %[
+#utc
+#]
+#    assert_equal false, d.instance.instance_eval{@localtime}
+#
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\t{"foo":1,"bar":501}\n2011-11-29T12:02:50Z\ttest\t{"foo":2,"bar":502}\n], text
+#
+#    d = create_driver %[
+#localtime
+#]
+#    assert_equal true, d.instance.instance_eval{@localtime}
+#
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    time_s = Time.parse("2011-11-29 12:02:50 UTC").getlocal.iso8601
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal time_s + %[\ttest\t{"foo":1,"bar":501}\n] + time_s + %[\ttest\t{"foo":2,"bar":502}\n], text
+#  end
+#
+#  def test_time_tag_onoff
+#    d = create_driver %[
+#output_include_time true
+#output_include_tag false
+#]
+#    assert_equal true, d.instance.output_include_time
+#    assert_equal false, d.instance.output_include_tag
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\t{"foo":1,"bar":501}\n2011-11-29T12:02:50Z\t{"foo":2,"bar":502}\n], text
+#
+#    d = create_driver %[
+#output_include_time false
+#output_include_tag true
+#]
+#    assert_equal false, d.instance.output_include_time
+#    assert_equal true, d.instance.output_include_tag
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[test\t{"foo":1,"bar":501}\ntest\t{"foo":2,"bar":502}\n], text
+#    
+#    d = create_driver %[
+#output_include_time false
+#output_include_tag false
+#]
+#    assert_equal false, d.instance.output_include_time
+#    assert_equal false, d.instance.output_include_tag
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[{"foo":1,"bar":501}\n{"foo":2,"bar":502}\n], text
+#  end
+#
+#  def test_data_type
+#    d = create_driver %[
+#output_data_type json
+#]
+#    assert_equal 'json', d.instance.output_data_type
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>"This is what you want"}, time)
+#    d.emit({"foo"=>2,"bar"=>"Is this what you want or not"}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\t{"foo":1,"bar":"This is what you want"}\n2011-11-29T12:02:50Z\ttest\t{"foo":2,"bar":"Is this what you want or not"}\n], text
+#
+#    d = create_driver %[
+#output_data_type attr:foo
+#]
+#    assert_equal 'attr:foo', d.instance.output_data_type
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>"This is what you want"}, time)
+#    d.emit({"foo"=>2,"bar"=>"Is this what you want or not"}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\t1\n2011-11-29T12:02:50Z\ttest\t2\n], text
+#
+#    d = create_driver %[
+#output_data_type attr:bar
+#]
+#    assert_equal 'attr:bar', d.instance.output_data_type
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>"This is what you want"}, time)
+#    d.emit({"foo"=>2,"bar"=>"Is this what you want or not"}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\tThis is what you want\n2011-11-29T12:02:50Z\ttest\tIs this what you want or not\n], text
+#
+#    d = create_driver %[
+#output_data_type attr:foo,bar
+#]
+#    assert_equal 'attr:foo,bar', d.instance.output_data_type
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>"This is what you want"}, time)
+#    d.emit({"foo"=>2,"bar"=>"Is this what you want or not"}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\t1\tThis is what you want\n2011-11-29T12:02:50Z\ttest\t2\tIs this what you want or not\n], text
+#  end
+#
+#  def test_add_newline
+#    d = create_driver %[
+#output_add_newline false
+#]
+#    assert_equal false, d.instance.output_add_newline
+#
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>"This is what you want"}, time)
+#    d.emit({"foo"=>2,"bar"=>"Is this what you want or not"}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\t{"foo":1,"bar":"This is what you want"}2011-11-29T12:02:50Z\ttest\t{"foo":2,"bar":"Is this what you want or not"}], text
+#    
+#    d = create_driver %[
+#output_add_newline false
+#]
+#    assert_equal false, d.instance.output_add_newline
+#
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>"This is what you want\n"}, time)
+#    d.emit({"foo"=>2,"bar"=>"Is this what you want or not\n"}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\t{"foo":1,"bar":"This is what you want\\n"}2011-11-29T12:02:50Z\ttest\t{"foo":2,"bar":"Is this what you want or not\\n"}], text
+#
+#    d = create_driver %[
+#output_data_type attr:bar
+#output_add_newline false
+#]
+#    assert_equal false, d.instance.output_add_newline
+#
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>"This is what you want\n"}, time)
+#    d.emit({"foo"=>2,"bar"=>"Is this what you want or not\n"}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\tThis is what you want\n2011-11-29T12:02:50Z\ttest\tIs this what you want or not\n], text
+#
+#    d = create_driver %[
+#output_data_type attr:bar
+#output_add_newline true
+#]
+#    assert_equal true, d.instance.output_add_newline
+#
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#    d.emit({"foo"=>1,"bar"=>"This is what you want\n"}, time)
+#    d.emit({"foo"=>2,"bar"=>"Is this what you want or not\n"}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z\ttest\tThis is what you want\n\n2011-11-29T12:02:50Z\ttest\tIs this what you want or not\n\n], text
+#  end
+#
+#  def test_field_separator
+#    time = Time.parse("2011-11-29 12:02:50 UTC").to_i
+#
+#    d = create_driver %[
+#output_field_separator SPACE
+#]
+#    assert_equal " ", d.instance.output_field_separator
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z test {"foo":1,"bar":501}\n2011-11-29T12:02:50Z test {"foo":2,"bar":502}\n], text
+#
+#    d = create_driver %[
+#output_field_separator SPACE
+#output_data_type attr:bar,foo
+#]
+#    assert_equal " ", d.instance.output_field_separator
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z test 501 1\n2011-11-29T12:02:50Z test 502 2\n], text
+#
+#    d = create_driver %[
+#output_field_separator COMMA
+#]
+#    assert_equal ",", d.instance.output_field_separator
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z,test,{"foo":1,"bar":501}\n2011-11-29T12:02:50Z,test,{"foo":2,"bar":502}\n], text
+#
+#    d = create_driver %[
+#output_field_separator COMMA
+#output_data_type attr:foo,bar
+#]
+#    assert_equal ",", d.instance.output_field_separator
+#    d.emit({"foo"=>1,"bar"=>501}, time)
+#    d.emit({"foo"=>2,"bar"=>502}, time)
+#    text = d.run
+#    assert_equal %[2011-11-29T12:02:50Z,test,1,501\n2011-11-29T12:02:50Z,test,2,502\n], text
+#  end
+#
+#end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-12-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &9186500 !ruby/object:Gem::Requirement
+  requirement: &70282132235300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *9186500
+  version_requirements: *70282132235300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9185640 !ruby/object:Gem::Requirement
+  requirement: &70282132234740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *9185640
+  version_requirements: *70282132234740
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &9184720 !ruby/object:Gem::Requirement
+  requirement: &70282132234020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9184720
+  version_requirements: *70282132234020
 - !ruby/object:Gem::Dependency
   name: cool.io
-  requirement: &9183560 !ruby/object:Gem::Requirement
+  requirement: &70282132233440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9183560
+  version_requirements: *70282132233440
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &9182640 !ruby/object:Gem::Requirement
+  requirement: &70282132232700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *9182640
+  version_requirements: *70282132232700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9181600 !ruby/object:Gem::Requirement
+  requirement: &70282132231740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *9181600
+  version_requirements: *70282132231740
 description: 
 email: frsyuki@gmail.com
 executables:
@@ -132,6 +132,7 @@ files:
 - lib/fluent/plugin/out_stream.rb
 - lib/fluent/plugin/out_test.rb
 - lib/fluent/process.rb
+- lib/fluent/supervisor.rb
 - lib/fluent/test.rb
 - lib/fluent/test/base.rb
 - lib/fluent/test/input_test.rb
@@ -140,6 +141,7 @@ files:
 - test/config.rb
 - test/helper.rb
 - test/match.rb
+- test/mixin.rb
 - test/plugin/in_exec.rb
 - test/plugin/in_forward.rb
 - test/plugin/in_http.rb
@@ -179,17 +181,18 @@ signing_key:
 specification_version: 3
 summary: Fluent event collector
 test_files:
+- test/config.rb
+- test/helper.rb
 - test/match.rb
-- test/plugin/out_roundrobin.rb
-- test/plugin/in_stream.rb
-- test/plugin/out_stream.rb
-- test/plugin/out_copy.rb
+- test/mixin.rb
+- test/plugin/in_exec.rb
 - test/plugin/in_forward.rb
-- test/plugin/out_forward.rb
 - test/plugin/in_http.rb
-- test/plugin/in_exec.rb
+- test/plugin/in_stream.rb
+- test/plugin/out_copy.rb
+- test/plugin/out_exec.rb
 - test/plugin/out_exec_filter.rb
 - test/plugin/out_file.rb
-- test/plugin/out_exec.rb
-- test/helper.rb
-- test/config.rb
+- test/plugin/out_forward.rb
+- test/plugin/out_roundrobin.rb
+- test/plugin/out_stream.rb