fluentd 0.14.13-x64-mingw32 → 0.14.17-x64-mingw32

data/test/plugin_helper/test_storage.rb

@@ -99,6 +99,15 @@ class StorageHelperTest < Test::Unit::TestCase
     assert_equal 0, d._storages.size
   end
 
+  test 'can be configured with hash' do
+    d = Dummy.new
+    d.configure(config_element())
+    conf = { '@type' => 'example' }
+    assert_nothing_raised do
+      d.storage_create(conf: conf)
+    end
+  end
+
   test 'can override default configuration parameters, but not overwrite whole definition' do
     d = Dummy.new
     d.configure(config_element())

data/test/test_log.rb

@@ -720,6 +720,12 @@ class PluginLoggerTest < Test::Unit::TestCase
       @log.write("log")
     end
 
+    def test_write_alias
+      assert(@log.respond_to?(:<<))
+      mock(@log.out).write("log")
+      @log << "log"
+    end
+
     def test_out
       assert_equal(@log.out, @logger.out)
       @log.out = Object.new

data/test/test_plugin_classes.rb

@@ -21,6 +21,28 @@ module FluentTest
     end
   end
 
+  class FluentTestGenInput < ::Fluent::Plugin::Input
+    ::Fluent::Plugin.register_input('test_in_gen', self)
+
+    attr_reader :started
+
+    config_param :num, :integer, default: 10000
+
+    def start
+      super
+      @started = true
+
+      @num.times { |i|
+        router.emit("test.evet", Fluent::EventTime.now, {'message' => 'Hello!', 'key' => "value#{i}", 'num' => i})
+      }
+    end
+
+    def shutdown
+      @started = false
+      super
+    end
+  end
+
   class FluentTestOutput < ::Fluent::Plugin::Output
     ::Fluent::Plugin.register_output('test_out', self)
 
@@ -112,6 +134,19 @@ module FluentTest
 
   class FluentTestBufferedOutput < ::Fluent::Plugin::Output
     ::Fluent::Plugin.register_output('test_out_buffered', self)
+
+    attr_reader :started
+
+    def start
+      super
+      @started = true
+    end
+
+    def shutdown
+      @started = false
+      super
+    end
+
     def write(chunk)
       # drop everything
     end
@@ -200,6 +235,21 @@ module FluentTest
     end
   end
 
+  class FluentTestBuffer < Fluent::Plugin::Buffer
+    ::Fluent::Plugin.register_buffer('test_buffer', self)
+
+    def resume
+      return {}, []
+    end
+
+    def generate_chunk(metadata)
+    end
+
+    def multi_workers_ready?
+      false
+    end
+  end
+
   class TestEmitErrorHandler
     def initialize
       @events = Hash.new { |h, k| h[k] = [] }

data/test/test_root_agent.rb

@@ -174,10 +174,15 @@ EOC
   end
 
   sub_test_case 'start/shutdown' do
-    setup do
-      @ra = RootAgent.new(log: $log)
-      stub(Engine).root_agent { @ra }
-      @ra.configure(Config.parse(<<-EOC, "(test)", "(test_dir)", true))
+    def setup_root_agent(conf)
+      ra = RootAgent.new(log: $log)
+      stub(Engine).root_agent { ra }
+      ra.configure(Config.parse(conf, "(test)", "(test_dir)", true))
+      ra
+    end
+
+    test 'plugin status' do
+      ra = setup_root_agent(<<-EOC)
 <source>
   @type test_in
   @id test_in
@@ -191,19 +196,41 @@ EOC
   @id test_out
 </match>
 EOC
-      @ra
+      ra.start
+      assert_true ra.inputs.first.started
+      assert_true ra.filters.first.started
+      assert_true ra.outputs.first.started
+
+      ra.shutdown
+      assert_false ra.inputs.first.started
+      assert_false ra.filters.first.started
+      assert_false ra.outputs.first.started
     end
 
-    test 'plugin status' do
-      @ra.start
-      assert_true @ra.inputs.first.started
-      assert_true @ra.filters.first.started
-      assert_true @ra.outputs.first.started
+    test 'output plugin threads should run before input plugin is blocked with buffer full' do
+      ra = setup_root_agent(<<-EOC)
+<source>
+  @type test_in_gen
+  @id test_in_gen
+</source>
+<match **>
+  @type test_out_buffered
+  @id test_out_buffered
+  <buffer>
+    chunk_limit_size 1k
+    queue_limit_length 2
+    flush_thread_count 2
+    overflow_action block
+  </buffer>
+</match>
+EOC
+      waiting(5) { ra.start }
+      assert_true ra.inputs.first.started
+      assert_true ra.outputs.first.started
 
-      @ra.shutdown
-      assert_false @ra.inputs.first.started
-      assert_false @ra.filters.first.started
-      assert_false @ra.outputs.first.started
+      ra.shutdown
+      assert_false ra.inputs.first.started
+      assert_false ra.outputs.first.started
     end
   end
 
@@ -581,4 +608,208 @@ EOC
       assert_equal [true, true], dyn_out.child.outputs.map{|i| i.terminated? }
     end
   end
+
+  sub_test_case 'configured at worker2 with 4 workers environment' do
+    setup do
+      ENV['SERVERENGINE_WORKER_ID'] = '2'
+      @ra = RootAgent.new(log: $log)
+      system_config = SystemConfig.new
+      system_config.workers = 4
+      stub(Engine).worker_id { 2 }
+      stub(Engine).root_agent { @ra }
+      stub(Engine).system_config { system_config }
+      @ra
+    end
+
+    teardown '' do
+      ENV.delete('SERVERENGINE_WORKER_ID')
+    end
+
+    def configure_ra(conf_str)
+      conf = Config.parse(conf_str, "(test)", "(test_dir)", true)
+      @ra.configure(conf)
+      @ra
+    end
+
+    test 'raises configuration error for missing worker id' do
+      errmsg = 'Missing worker id on <worker> directive'
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        conf = <<-EOC
+<worker>
+</worker>
+EOC
+        configure_ra(conf)
+      end
+    end
+
+    test 'raises configuration error for too big worker id' do
+      errmsg = "worker id 4 specified by <worker> directive is not allowed. Available worker id is between 0 and 3"
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        conf = <<-EOC
+<worker 4>
+</worker>
+EOC
+        configure_ra(conf)
+      end
+    end
+
+    test 'raises configuration error for invalid elements as a child of worker section' do
+      errmsg = '<worker> section cannot have <system> directive'
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        conf = <<-EOC
+<worker 2>
+<system>
+</system>
+</worker>
+EOC
+        configure_ra(conf)
+      end
+    end
+
+    test 'raises configuration error when configured plugins do not have support multi worker configuration' do
+      errmsg = "Plugin 'test_out' does not support multi workers configuration (FluentTest::FluentTestOutput)"
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        conf = <<-EOC
+<match **>
+@type test_out
+</match>
+EOC
+        configure_ra(conf)
+      end
+    end
+
+    test 'does not raise configuration error when configured plugins in worker section do not have support multi worker configuration' do
+      assert_nothing_raised do
+        conf = <<-EOC
+<worker 2>
+<match **>
+  @type test_out
+</match>
+</worker>
+EOC
+        configure_ra(conf)
+      end
+    end
+
+    test 'does not raise configuration error when configured plugins as a children of MultiOutput in worker section do not have support multi worker configuration' do
+      assert_nothing_raised do
+        conf = <<-EOC
+<worker 2>
+<match **>
+  @type copy
+  <store>
+    @type test_out
+  </store>
+  <store>
+    @type test_out
+  </store>
+</match>
+</worker>
+EOC
+        configure_ra(conf)
+      end
+    end
+
+    test 'does not raise configuration error when configured plugins owned by plugin do not have support multi worker configuration' do
+      assert_nothing_raised do
+        conf = <<-EOC
+<worker 2>
+<match **>
+  @type test_out_buffered
+  <buffer>
+    @type test_buffer
+  </buffer>
+</match>
+</worker>
+EOC
+        configure_ra(conf)
+      end
+    end
+
+    test 'with plugins' do
+      conf = <<-EOC
+<worker 2>
+<source>
+  @type test_in
+  @id test_in
+</source>
+<filter>
+  type test_filter
+  id test_filter
+</filter>
+<match **>
+  @type relabel
+  @id test_relabel
+  @label @test
+</match>
+<label @test>
+  <match **>
+    type test_out
+    id test_out
+  </match>
+</label>
+<label @ERROR>
+  <match>
+    @type null
+  </match>
+</label>
+</worker>
+EOC
+      ra = configure_ra(conf)
+      assert_kind_of FluentTestInput, ra.inputs.first
+      assert_kind_of Plugin::RelabelOutput, ra.outputs.first
+      assert_kind_of FluentTestFilter, ra.filters.first
+      assert ra.error_collector
+
+      %W(@test @ERROR).each { |label_symbol|
+        assert_include ra.labels, label_symbol
+        assert_kind_of Label, ra.labels[label_symbol]
+      }
+
+      test_label = ra.labels['@test']
+      assert_kind_of FluentTestOutput, test_label.outputs.first
+      assert_equal ra, test_label.root_agent
+
+      error_label = ra.labels['@ERROR']
+      assert_kind_of Fluent::Plugin::NullOutput, error_label.outputs.first
+      assert_kind_of RootAgent::RootAgentProxyWithoutErrorCollector, error_label.root_agent
+    end
+
+    test 'with plugins but for another worker' do
+      conf = <<-EOC
+<worker 0>
+<source>
+  @type test_in
+  @id test_in
+</source>
+<filter>
+  type test_filter
+  id test_filter
+</filter>
+<match **>
+  @type relabel
+  @id test_relabel
+  @label @test
+</match>
+<label @test>
+  <match **>
+    type test_out
+    id test_out
+  </match>
+</label>
+<label @ERROR>
+  <match>
+    @type null
+  </match>
+</label>
+</worker>
+EOC
+      ra = configure_ra(conf)
+      assert_equal 0, ra.inputs.size
+      assert_equal 0, ra.outputs.size
+      assert_equal 0, ra.filters.size
+      assert_equal 0, ra.labels.size
+      refute ra.error_collector
+    end
+  end
 end

data/test/test_time_parser.rb

@@ -34,6 +34,18 @@ class TimeParserTest < ::Test::Unit::TestCase
     assert_equal_event_time(time, parser.parse('28/Feb/2013:12:00:00:123456789 +0900'))
   end
 
+  def test_parse_iso8601
+    parser = Fluent::TimeParser.new('%iso8601')
+
+    assert(parser.parse('2017-01-01T12:00:00+09:00').is_a?(Fluent::EventTime))
+
+    time = event_time('2017-01-01T12:00:00+09:00')
+    assert_equal(time, parser.parse('2017-01-01T12:00:00+09:00'))
+
+    time_with_msec = event_time('2017-01-01T12:00:00.123+09:00')
+    assert_equal(time_with_msec, parser.parse('2017-01-01T12:00:00.123+09:00'))
+  end
+
   def test_parse_with_invalid_argument
     parser = Fluent::TimeParser.new
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.13
+  version: 0.14.17
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -48,16 +48,22 @@ dependencies:
   name: cool.io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +365,7 @@ files:
 - COPYING
 - ChangeLog
 - Gemfile
+- MAINTAINERS.md
 - README.md
 - Rakefile
 - Vagrantfile
@@ -404,6 +411,7 @@ files:
 - example/suppress_config_dump.conf
 - example/v0_12_filter.conf
 - example/v1_literal_example.conf
+- example/worker_section.conf
 - fluent.conf
 - fluentd.gemspec
 - lib/fluent/agent.rb
@@ -769,7 +777,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector