fluentd 0.10.45 → 0.10.46

data/spec/config/section_spec.rb

@@ -0,0 +1,97 @@
+require 'fluent/config/section'
+
+describe Fluent::Config::Section do
+  context 'class' do
+    describe '.name' do
+      it 'returns its full module name as String' do
+        expect(Fluent::Config::Section.name).to eql('Fluent::Config::Section')
+      end
+    end
+  end
+
+  context 'instance object' do
+    describe '#initialize' do
+      it 'creates blank object without argument' do
+        s = Fluent::Config::Section.new
+        expect(s.instance_eval{ @params }).to eql({})
+      end
+
+      it 'creates object which contains specified hash object itself' do
+        hash = {
+          name: 'tagomoris',
+          age: 34,
+          send: 'email',
+          class: 'normal',
+          keys: 5,
+        }
+        s1 = Fluent::Config::Section.new(hash)
+        expect(s1.instance_eval{ @params }).to eq(hash)
+        expect(s1[:name]).to eql("tagomoris")
+        expect(s1[:age]).to eql(34)
+        expect(s1[:send]).to eql("email")
+        expect(s1[:class]).to eql("normal")
+        expect(s1[:keys]).to eql(5)
+
+        expect(s1.name).to eql("tagomoris")
+        expect(s1.age).to eql(34)
+        expect(s1.send).to eql("email")
+        expect(s1.class).to eql("normal")
+        expect(s1.keys).to eql(5)
+
+        expect{ s1.dup }.to raise_error(NoMethodError)
+      end
+    end
+
+    describe '#to_h' do
+      it 'returns internal hash itself' do
+        hash = {
+          name: 'tagomoris',
+          age: 34,
+          send: 'email',
+          class: 'normal',
+          keys: 5,
+        }
+        s = Fluent::Config::Section.new(hash)
+        expect(s.to_h).to eq(hash)
+        expect(s.to_h.class).to eq(Hash)
+      end
+    end
+
+    describe '#instance_of?' do
+      it 'can judge whether it is a Section object or not' do
+        s = Fluent::Config::Section.new
+        expect(s.instance_of?(Fluent::Config::Section)).to be_true
+        expect(s.instance_of?(BasicObject)).to be_false
+      end
+    end
+
+    describe '#is_a?' do
+      it 'can judge whether it belongs to or not' do
+        s = Fluent::Config::Section.new
+        expect(s.is_a?(Fluent::Config::Section)).to be_true
+        expect(s.kind_of?(Fluent::Config::Section)).to be_true
+        expect(s.is_a?(BasicObject)).to be_true
+      end
+    end
+
+    describe '#+' do
+      it 'can merge 2 sections: argument side is primary, internal hash is newly created' do
+        h1 = {name: "s1", num: 10, class: "A"}
+        s1 = Fluent::Config::Section.new(h1)
+
+        h2 = {name: "s2", class: "A", num2: "5", num3: "8"}
+        s2 = Fluent::Config::Section.new(h2)
+        s = s1 + s2
+
+        expect(s.to_h.object_id).not_to eq(h1.object_id)
+        expect(s.to_h.object_id).not_to eq(h2.object_id)
+
+        expect(s.name).to eql("s2")
+        expect(s.num).to eql(10)
+        expect(s.class).to eql("A")
+        expect(s.num2).to eql("5")
+        expect(s.num3).to eql("8")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,60 @@
+
+require 'fluent/load'
+require 'fileutils'
+
+src_root = File.expand_path('..', File.dirname(__FILE__))
+$LOAD_PATH << File.join(src_root, "lib")
+$LOAD_PATH << src_root
+
+if ENV['SIMPLE_COV']
+  require 'simplecov'
+  if defined?(SimpleCov::SourceFile)
+    mod = SimpleCov::SourceFile
+    def mod.new(*args, &block)
+      m = allocate
+      m.instance_eval do
+        begin
+          initialize(*args, &block)
+        rescue Encoding::UndefinedConversionError
+          @src = "".force_encoding('UTF-8')
+        end
+      end
+      m
+    end
+  end
+  SimpleCov.start do
+    add_filter 'spec/'
+    add_filter 'pkg/'
+    add_filter 'vendor/'
+  end
+end
+
+if ENV['GC_STRESS']
+  STDERR.puts "enable GC.stress"
+  GC.stress = true
+end
+
+require 'fluent/log'
+require 'fluent/plugin'
+
+class DummyLogDevice
+  attr_reader :logs
+  def initialize ; @logs = [] ; end
+  def tty? ; false ; end
+  def puts(*args) ; args.each{ |arg| write(arg + "\n") } ; end
+  def write(message) ; @logs.push message ; end
+  def flush ; true ; end
+  def close ; true ; end
+end
+
+class TestLogger < Fluent::PluginLogger
+  def initialize
+    @logdev = DummyLogDevice.new
+    super(Fluent::Log.new(@logdev))
+  end
+  def logs
+    @logdev.logs
+  end
+end
+
+$log ||= TestLogger.new

data/test/plugin/{in_forward.rb → test_in_forward.rb}

@@ -20,8 +20,13 @@ class ForwardInputTest < Test::Unit::TestCase
     d = create_driver
     assert_equal PORT, d.instance.port
     assert_equal '127.0.0.1', d.instance.bind
+    assert_equal 0, d.instance.linger_timeout
+    assert_equal 0.5, d.instance.blocking_timeout
+    assert !d.instance.backlog
   end
 
+  # TODO: Will add Loop::run arity check with stub/mock library
+
   def connect
     TCPSocket.new('127.0.0.1', PORT)
   end

data/test/plugin/{out_forward.rb → test_out_forward.rb}

@@ -1,4 +1,5 @@
 require 'fluent/test'
+require 'helper'
 
 class ForwardOutputTest < Test::Unit::TestCase
   def setup
@@ -38,4 +39,18 @@ class ForwardOutputTest < Test::Unit::TestCase
     d = create_driver(CONFIG + "\nheartbeat_type tcp")
     assert_equal :tcp, d.instance.heartbeat_type
   end
+
+  def test_phi_failure_detector
+    d = create_driver(CONFIG + %[phi_failure_detector false \n phi_threshold 0])
+    node = d.instance.nodes.first
+    stub(node.failure).phi { raise 'Should not be called' }
+    node.tick
+    assert_equal node.available, true
+
+    d = create_driver(CONFIG + %[phi_failure_detector true \n phi_threshold 0])
+    node = d.instance.nodes.first
+    node.tick
+    assert_equal node.available, false
+  end
 end
+

data/test/scripts/fluent/plugin/parser_known.rb

@@ -0,0 +1,3 @@
+module Fluent
+  TextParser.register_template('known', /^(?<message>.*)$/)
+end

data/test/{config.rb → test_config.rb}

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 require 'fluent/config'
+require 'fluent/config/parser'
 require 'fluent/supervisor'
 require 'fluent/load'
 require 'fileutils'

data/test/{configdsl.rb → test_configdsl.rb}

@@ -1,4 +1,4 @@
-require 'fluent/config_dsl'
+require 'fluent/config/dsl'
 require 'fluent/test'
 require 'helper'
 

data/test/{parser.rb → test_parser.rb}

@@ -80,7 +80,7 @@ module ParserTest
     include ParserTest
 
     def setup
-      @parser = TextParser::TEMPLATE_FACTORIES['apache'].call
+      @parser = TextParser::TEMPLATE_REGISTRY.lookup('apache').call
     end
 
     def test_call
@@ -126,7 +126,7 @@ module ParserTest
     include ParserTest
 
     def setup
-      @parser = TextParser::TEMPLATE_FACTORIES['syslog'].call
+      @parser = TextParser::TEMPLATE_REGISTRY.lookup('syslog').call
     end
 
     def test_call
@@ -165,7 +165,7 @@ module ParserTest
     include ParserTest
 
     def setup
-      @parser = TextParser::TEMPLATE_FACTORIES['nginx'].call
+      @parser = TextParser::TEMPLATE_REGISTRY.lookup('nginx').call
       @expected = {
         'remote'  => '127.0.0.1',
         'host'    => '192.168.0.1',
@@ -267,7 +267,7 @@ module ParserTest
     end
 
     def test_call
-      parser = TextParser::TEMPLATE_FACTORIES['none'].call
+      parser = TextParser::TEMPLATE_REGISTRY.lookup('none').call
       time, record = parser.call('log message!')
 
       assert_equal({'message' => 'log message!'}, record)
@@ -286,7 +286,7 @@ module ParserTest
     include ParserTest
 
     def create_parser(conf)
-      parser = TextParser::TEMPLATE_FACTORIES['multiline'].call
+      parser = TextParser::TEMPLATE_REGISTRY.lookup('multiline').call
       parser.configure(conf)
       parser
     end
@@ -363,4 +363,21 @@ EOS
       }, record)
     end
   end
+
+  class ParserLookupTest < ::Test::Unit::TestCase
+    include ParserTest
+
+    def test_unknown_format
+      assert_raise ConfigError do
+        TextParser::TEMPLATE_REGISTRY.lookup('unknown')
+      end
+    end
+
+    def test_find_parser
+      $LOAD_PATH.unshift(File.join(File.expand_path(File.dirname(__FILE__)), 'scripts'))
+      assert_nothing_raised ConfigError do
+        TextParser::TEMPLATE_REGISTRY.lookup('known')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.45
+  version: 0.10.46
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -112,16 +112,22 @@ dependencies:
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sigdump
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +184,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +274,17 @@ files:
 - lib/fluent/command/debug.rb
 - lib/fluent/command/fluentd.rb
 - lib/fluent/config.rb
-- lib/fluent/config_dsl.rb
+- lib/fluent/config/basic_parser.rb
+- lib/fluent/config/configure_proxy.rb
+- lib/fluent/config/dsl.rb
+- lib/fluent/config/element.rb
+- lib/fluent/config/error.rb
+- lib/fluent/config/literal_parser.rb
+- lib/fluent/config/parser.rb
+- lib/fluent/config/section.rb
+- lib/fluent/config/types.rb
+- lib/fluent/config/v1_parser.rb
+- lib/fluent/configurable.rb
 - lib/fluent/engine.rb
 - lib/fluent/env.rb
 - lib/fluent/event.rb
@@ -279,6 +323,7 @@ files:
 - lib/fluent/plugin/out_test.rb
 - lib/fluent/plugin/socket_util.rb
 - lib/fluent/process.rb
+- lib/fluent/registry.rb
 - lib/fluent/status.rb
 - lib/fluent/supervisor.rb
 - lib/fluent/test.rb
@@ -286,37 +331,46 @@ files:
 - lib/fluent/test/input_test.rb
 - lib/fluent/test/output_test.rb
 - lib/fluent/version.rb
-- test/config.rb
-- test/configdsl.rb
+- spec/config/config_parser_spec.rb
+- spec/config/configurable_spec.rb
+- spec/config/configure_proxy_spec.rb
+- spec/config/dsl_spec.rb
+- spec/config/helper.rb
+- spec/config/literal_parser_spec.rb
+- spec/config/section_spec.rb
+- spec/spec_helper.rb
 - test/helper.rb
-- test/match.rb
-- test/mixin.rb
-- test/output.rb
-- test/parser.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
 - test/plugin/data/2010/01/20100102.log
 - test/plugin/data/log/bar
 - test/plugin/data/log/foo/bar.log
 - test/plugin/data/log/test.log
-- test/plugin/in_exec.rb
-- test/plugin/in_forward.rb
-- test/plugin/in_gc_stat.rb
-- test/plugin/in_http.rb
-- test/plugin/in_object_space.rb
-- test/plugin/in_status.rb
-- test/plugin/in_stream.rb
-- test/plugin/in_syslog.rb
-- test/plugin/in_tail.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_forward.rb
-- test/plugin/out_roundrobin.rb
-- test/plugin/out_stdout.rb
-- test/plugin/out_stream.rb
+- test/plugin/test_in_exec.rb
+- test/plugin/test_in_forward.rb
+- test/plugin/test_in_gc_stat.rb
+- test/plugin/test_in_http.rb
+- test/plugin/test_in_object_space.rb
+- test/plugin/test_in_status.rb
+- test/plugin/test_in_stream.rb
+- test/plugin/test_in_syslog.rb
+- test/plugin/test_in_tail.rb
+- test/plugin/test_out_copy.rb
+- test/plugin/test_out_exec.rb
+- test/plugin/test_out_exec_filter.rb
+- test/plugin/test_out_file.rb
+- test/plugin/test_out_forward.rb
+- test/plugin/test_out_roundrobin.rb
+- test/plugin/test_out_stdout.rb
+- test/plugin/test_out_stream.rb
 - test/scripts/exec_script.rb
+- test/scripts/fluent/plugin/parser_known.rb
+- test/test_config.rb
+- test/test_configdsl.rb
+- test/test_match.rb
+- test/test_mixin.rb
+- test/test_output.rb
+- test/test_parser.rb
 homepage: http://fluentd.org/
 licenses: []
 metadata: {}
@@ -341,34 +395,43 @@ signing_key:
 specification_version: 4
 summary: Fluentd event collector
 test_files:
-- test/config.rb
-- test/configdsl.rb
+- spec/config/config_parser_spec.rb
+- spec/config/configurable_spec.rb
+- spec/config/configure_proxy_spec.rb
+- spec/config/dsl_spec.rb
+- spec/config/helper.rb
+- spec/config/literal_parser_spec.rb
+- spec/config/section_spec.rb
+- spec/spec_helper.rb
 - test/helper.rb
-- test/match.rb
-- test/mixin.rb
-- test/output.rb
-- test/parser.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
 - test/plugin/data/2010/01/20100102.log
 - test/plugin/data/log/bar
 - test/plugin/data/log/foo/bar.log
 - test/plugin/data/log/test.log
-- test/plugin/in_exec.rb
-- test/plugin/in_forward.rb
-- test/plugin/in_gc_stat.rb
-- test/plugin/in_http.rb
-- test/plugin/in_object_space.rb
-- test/plugin/in_status.rb
-- test/plugin/in_stream.rb
-- test/plugin/in_syslog.rb
-- test/plugin/in_tail.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_forward.rb
-- test/plugin/out_roundrobin.rb
-- test/plugin/out_stdout.rb
-- test/plugin/out_stream.rb
+- test/plugin/test_in_exec.rb
+- test/plugin/test_in_forward.rb
+- test/plugin/test_in_gc_stat.rb
+- test/plugin/test_in_http.rb
+- test/plugin/test_in_object_space.rb
+- test/plugin/test_in_status.rb
+- test/plugin/test_in_stream.rb
+- test/plugin/test_in_syslog.rb
+- test/plugin/test_in_tail.rb
+- test/plugin/test_out_copy.rb
+- test/plugin/test_out_exec.rb
+- test/plugin/test_out_exec_filter.rb
+- test/plugin/test_out_file.rb
+- test/plugin/test_out_forward.rb
+- test/plugin/test_out_roundrobin.rb
+- test/plugin/test_out_stdout.rb
+- test/plugin/test_out_stream.rb
 - test/scripts/exec_script.rb
+- test/scripts/fluent/plugin/parser_known.rb
+- test/test_config.rb
+- test/test_configdsl.rb
+- test/test_match.rb
+- test/test_mixin.rb
+- test/test_output.rb
+- test/test_parser.rb