fluentd 0.10.36 → 0.10.37

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.36'
+  VERSION = '0.10.37'
 
 end

data/test/configdsl.rb

@@ -0,0 +1,77 @@
+require 'fluent/config_dsl'
+
+class ConfigDSLTest < Test::Unit::TestCase
+  # TEST_CONFIG1 = %[
+  #   <source>
+  #     type forward
+  #     port 24224
+  #   </source>
+  #   <match test.**>
+  #     type forward
+  #     flush_interval 1s
+  #     <server>
+  #       host host0.example.com
+  #       port 24224
+  #     </server>
+  #     <server>
+  #       host host1.example.com
+  #       port 24224
+  #     </server>
+  #   </match>
+  # ]
+  TEST_DSL_CONFIG1 = %q[
+source {
+  type "forward"
+  port 24224
+}
+match('test.**') {
+  type "forward"
+  flush_interval "1s"
+  (0..1).each do |i|
+    server {
+      host "host#{i}.example.com"
+      port 24224
+    }
+  end
+}
+]
+
+  TEST_DSL_CONFIG2 = %q[
+v = [0, 1, 2]
+]
+
+  def test_parse
+    root = Fluent::Config::DSL::DSLParser.parse(TEST_DSL_CONFIG1)
+
+    assert_equal 0, root.keys.size
+    assert_equal 2, root.elements.size
+
+    e0 = root.elements[0]
+    assert_equal 'source', e0.name
+    assert_equal '', e0.arg
+    assert_equal 'forward', e0['type']
+    assert_equal '24224', e0['port']
+
+    e1 = root.elements[1]
+    assert_equal 'match', e1.name
+    assert_equal 'test.**', e1.arg
+    assert_equal 'forward', e1['type']
+    assert_equal '1s', e1['flush_interval']
+    assert_equal 2, e1.elements.size
+    e1s0 = e1.elements[0]
+    assert_equal 'server', e1s0.name
+    assert_equal 'host0.example.com', e1s0['host']
+    assert_equal '24224', e1s0['port']
+    e1s1 = e1.elements[1]
+    assert_equal 'server', e1s1.name
+    assert_equal 'host1.example.com', e1s1['host']
+    assert_equal '24224', e1s1['port']
+  end
+
+  def test_parse2
+    root = Fluent::Config::DSL::DSLParser.parse(TEST_DSL_CONFIG2)
+
+    assert_equal 0, root.keys.size
+    assert_equal 0, root.elements.size
+  end
+end

data/test/plugin/in_exec.rb

@@ -4,33 +4,82 @@ require 'net/http'
 class ExecInputTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
+    @test_time = Time.parse("2011-01-02 13:14:15").to_i
+    @script = File.expand_path(File.join(File.dirname(__FILE__), '..', 'scripts', 'exec_script.rb'))
   end
 
-  CONFIG = %[
-    command bash -c "echo -e '2011-01-02 13:14:15\ttag1\tok'"
-    keys time,tag,k1
-    time_key time
-    tag_key tag
-    time_format %Y-%m-%d %H:%M:%S
-    run_interval 1s
-  ]
-
-  def create_driver(conf=CONFIG)
+  def create_driver(conf = tsv_config)
     Fluent::Test::InputTestDriver.new(Fluent::ExecInput).configure(conf)
   end
 
+  def tsv_config
+    %[
+      command ruby #{@script} "2011-01-02 13:14:15" 0
+      keys time,tag,k1
+      time_key time
+      tag_key tag
+      time_format %Y-%m-%d %H:%M:%S
+      run_interval 1s
+    ]
+  end
+
+  def json_config
+    %[
+      command ruby #{@script} #{@test_time} 1
+      format json
+      tag_key tag
+      time_key time
+      run_interval 1s
+    ]
+  end
+
+  def msgpack_config
+    %[
+      command ruby #{@script} #{@test_time} 2
+      format msgpack
+      tag_key tagger
+      time_key datetime
+      run_interval 1s
+    ]
+  end
+
   def test_configure
     d = create_driver
+    assert_equal :tsv, d.instance.format
     assert_equal ["time","tag","k1"], d.instance.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
   end
 
+  def test_configure_with_json
+    d = create_driver json_config
+    assert_equal :json, d.instance.format
+    assert_equal [], d.instance.keys
+  end
+
+  def test_configure_with_msgpack
+    d = create_driver msgpack_config
+    assert_equal :msgpack, d.instance.format
+    assert_equal [], d.instance.keys
+  end
+
+  # TODO: Merge following tests into one case with parameters
+
   def test_emit
     d = create_driver
 
-    time = Time.parse("2011-01-02 13:14:15").to_i
+    d.run do
+      sleep 2
+    end
+
+    emits = d.emits
+    assert_equal true, emits.length > 0
+    assert_equal ["tag1", @test_time, {"k1"=>"ok"}], emits[0]
+  end
+
+  def test_emit_json
+    d = create_driver json_config
 
     d.run do
       sleep 2
@@ -38,7 +87,18 @@ class ExecInputTest < Test::Unit::TestCase
 
     emits = d.emits
     assert_equal true, emits.length > 0
-    assert_equal ["tag1", time, {"k1"=>"ok"}], emits[0]
+    assert_equal ["tag1", @test_time, {"k1"=>"ok"}], emits[0]
   end
-end
 
+  def test_emit_msgpack
+    d = create_driver msgpack_config
+
+    d.run do
+      sleep 2
+    end
+
+    emits = d.emits
+    assert_equal true, emits.length > 0
+    assert_equal ["tag1", @test_time, {"k1"=>"ok"}], emits[0]
+  end
+end

data/test/plugin/in_gc_stat.rb

@@ -1,6 +1,6 @@
 require 'fluent/test'
 
-class ObjectSpaceInputTest < Test::Unit::TestCase
+class GCStatInputTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup
   end

data/test/plugin/in_object_space.rb

@@ -11,13 +11,13 @@ class ObjectSpaceInputTest < Test::Unit::TestCase
     Fluent::Test.setup
   end
 
-  CONFIG = %[
+  TESTCONFIG = %[
     emit_interval 1
     tag t1
     top 2
   ]
 
-  def create_driver(conf=CONFIG)
+  def create_driver(conf=TESTCONFIG)
     Fluent::Test::InputTestDriver.new(Fluent::ObjectSpaceInput).configure(conf)
   end
 

data/test/plugin/out_stdout.rb

@@ -14,9 +14,52 @@ class StdoutOutputTest < Test::Unit::TestCase
 
   def test_configure
     d = create_driver
+    assert_equal :json, d.instance.output_type
   end
 
-  # def test_emit
-  # end
+  def test_configure_output_type
+    d = create_driver(CONFIG + "\noutput_type json")
+    assert_equal :json, d.instance.output_type
+
+    d = create_driver(CONFIG + "\noutput_type hash")
+    assert_equal :hash, d.instance.output_type
+
+    assert_raise(Fluent::ConfigError) do
+      d = create_driver(CONFIG + "\noutput_type foo")
+    end
+  end
+
+  def test_emit_json
+    d = create_driver(CONFIG + "\noutput_type json")
+    time = Time.now
+    out = capture_log { d.emit({'test' => 'test'}, time) }
+    assert_equal "#{time.localtime} test: {\"test\":\"test\"}\n", out
+
+    # NOTE: Float::NAN is not jsonable
+    assert_raise(Yajl::EncodeError) { d.emit({'test' => Float::NAN}, time) }
+  end
+
+  def test_emit_hash
+    d = create_driver(CONFIG + "\noutput_type hash")
+    time = Time.now
+    out = capture_log { d.emit({'test' => 'test'}, time) }
+    assert_equal "#{time.localtime} test: {\"test\"=>\"test\"}\n", out
+
+    # NOTE: Float::NAN is not jsonable, but hash string can output it.
+    out = capture_log { d.emit({'test' => Float::NAN}, time) }
+    assert_equal "#{time.localtime} test: {\"test\"=>NaN}\n", out
+  end
+
+  private
+
+  # Capture the log output of the block given
+  def capture_log(&block)
+    tmp = $log
+    $log = StringIO.new
+    yield
+    return $log.string
+  ensure
+    $log = tmp
+  end
 end
 

data/test/scripts/exec_script.rb

@@ -0,0 +1,26 @@
+require 'json'
+require 'msgpack'
+
+def gen_tsv(time)
+  "#{time}\ttag1\tok"
+end
+
+def gen_json(time)
+  {'tag' => 'tag1', 'time' => time, 'k1' => 'ok'}.to_json
+end
+
+def gen_msgpack(time)
+  {'tagger' => 'tag1', 'datetime' => time, 'k1' => 'ok'}.to_msgpack
+end
+
+time = ARGV.first
+time = Integer(time) rescue time
+
+case ARGV.last.to_i
+when 0
+  puts gen_tsv(time)
+when 1
+  puts gen_json(time)
+when 2
+  print gen_msgpack(time)
+end

metadata

@@ -1,34 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.36
-  prerelease: 
+  version: 0.10.37
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -37,21 +35,20 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -60,23 +57,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,7 +78,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -92,7 +85,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cool.io
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,7 +92,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -108,7 +99,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -116,7 +106,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -124,49 +113,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: Fluentd is an event collector system. It is a generalized version of
@@ -201,6 +184,7 @@ files:
 - lib/fluent/command/debug.rb
 - lib/fluent/command/fluentd.rb
 - lib/fluent/config.rb
+- lib/fluent/config_dsl.rb
 - lib/fluent/engine.rb
 - lib/fluent/env.rb
 - lib/fluent/event.rb
@@ -215,6 +199,7 @@ files:
 - lib/fluent/plugin/buf_file.rb
 - lib/fluent/plugin/buf_memory.rb
 - lib/fluent/plugin/buf_zfile.rb
+- lib/fluent/plugin/exec_util.rb
 - lib/fluent/plugin/in_debug_agent.rb
 - lib/fluent/plugin/in_exec.rb
 - lib/fluent/plugin/in_forward.rb
@@ -246,6 +231,7 @@ files:
 - lib/fluent/test/output_test.rb
 - lib/fluent/version.rb
 - test/config.rb
+- test/configdsl.rb
 - test/helper.rb
 - test/match.rb
 - test/mixin.rb
@@ -267,35 +253,33 @@ files:
 - test/plugin/out_roundrobin.rb
 - test/plugin/out_stdout.rb
 - test/plugin/out_stream.rb
+- test/scripts/exec_script.rb
 homepage: http://fluentd.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1938960347567989865
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fluentd event collector
 test_files:
 - test/config.rb
+- test/configdsl.rb
 - test/helper.rb
 - test/match.rb
 - test/mixin.rb
@@ -317,3 +301,4 @@ test_files:
 - test/plugin/out_roundrobin.rb
 - test/plugin/out_stdout.rb
 - test/plugin/out_stream.rb
+- test/scripts/exec_script.rb