fluentd 0.12.20 → 0.12.21

data/test/plugin/test_in_forward.rb

@@ -1,7 +1,11 @@
 require_relative '../helper'
+
 require 'fluent/test'
 require 'base64'
 
+require 'fluent/env'
+require 'fluent/plugin/in_forward'
+
 class ForwardInputTest < Test::Unit::TestCase
   def setup
     Fluent::Test.setup

data/test/plugin/test_in_tail.rb

@@ -30,6 +30,9 @@ class TailInputTest < Test::Unit::TestCase
   CONFIG_READ_FROM_HEAD = %[
     read_from_head true
   ]
+  CONFIG_ENABLE_WATCH_TIMER = %[
+    enable_watch_timer false
+  ]
   SINGLE_LINE_CONFIG = %[
     format /(?<message>.*)/
   ]
@@ -124,6 +127,32 @@ class TailInputTest < Test::Unit::TestCase
     assert_equal({"message" => "test4"}, emits[3][2])
   end
 
+  def test_emit_with_enable_watch_timer
+    File.open("#{TMP_DIR}/tail.txt", "wb") {|f|
+      f.puts "test1"
+      f.puts "test2"
+    }
+
+    d = create_driver(CONFIG_ENABLE_WATCH_TIMER + SINGLE_LINE_CONFIG)
+
+    d.run do
+      sleep 1
+
+      File.open("#{TMP_DIR}/tail.txt", "ab") {|f|
+        f.puts "test3"
+        f.puts "test4"
+      }
+      # according to cool.io's stat_watcher.c, systems without inotify will use
+      # an "automatic" value, typically around 5 seconds
+      sleep 10
+    end
+
+    emits = d.emits
+    assert(emits.length > 0)
+    assert_equal({"message" => "test3"}, emits[0][2])
+    assert_equal({"message" => "test4"}, emits[1][2])
+  end
+
   def test_rotate_file
     emits = sub_test_rotate_file(SINGLE_LINE_CONFIG)
     assert_equal(4, emits.length)
@@ -484,7 +513,7 @@ class TailInputTest < Test::Unit::TestCase
 
       flexstub(Fluent::NewTailInput::TailWatcher) do |watcherclass|
         EX_PATHS.each do |path|
-          watcherclass.should_receive(:new).with(path, EX_RORATE_WAIT, Fluent::NewTailInput::FilePositionEntry, any, true, 1000, any, any, any).once.and_return do
+          watcherclass.should_receive(:new).with(path, EX_RORATE_WAIT, Fluent::NewTailInput::FilePositionEntry, any, true, true, 1000, any, any, any).once.and_return do
             flexmock('TailWatcher') { |watcher|
               watcher.should_receive(:attach).once
               watcher.should_receive(:unwatched=).zero_or_more_times
@@ -500,7 +529,7 @@ class TailInputTest < Test::Unit::TestCase
       end
 
       flexstub(Fluent::NewTailInput::TailWatcher) do |watcherclass|
-        watcherclass.should_receive(:new).with('test/plugin/data/2010/01/20100102-030406.log', EX_RORATE_WAIT, Fluent::NewTailInput::FilePositionEntry, any, true, 1000, any, any, any).once.and_return do
+        watcherclass.should_receive(:new).with('test/plugin/data/2010/01/20100102-030406.log', EX_RORATE_WAIT, Fluent::NewTailInput::FilePositionEntry, any, true, true, 1000, any, any, any).once.and_return do
           flexmock('TailWatcher') do |watcher|
             watcher.should_receive(:attach).once
             watcher.should_receive(:unwatched=).zero_or_more_times
@@ -609,4 +638,46 @@ class TailInputTest < Test::Unit::TestCase
       assert_equal({"message" => "test4"}, emits[1][2])
     end
   end
+
+  sub_test_case 'emit error cases' do
+    def test_emit_error_with_buffer_queue_limit_error
+      emits = execute_test(::Fluent::BufferQueueLimitError, "queue size exceeds limit")
+      assert_equal(10, emits.length)
+      10.times { |i|
+        assert_equal({"message" => "test#{i}"}, emits[i][2])
+      }
+    end
+
+    def test_emit_error_with_non_buffer_queue_limit_error
+      emits = execute_test(StandardError, "non BufferQueueLimitError error")
+      assert_true(emits.size > 0 && emits.size != 10)
+      emits.size.times { |i|
+        assert_equal({"message" => "test#{10 - emits.size + i}"}, emits[i][2])
+      }
+    end
+
+    def execute_test(error_class, error_message)
+      d = create_driver(CONFIG_READ_FROM_HEAD + SINGLE_LINE_CONFIG)
+      # Use define_singleton_method instead of d.emit_stream to capture local variable
+      d.define_singleton_method(:emit_stream) do |tag, es|
+        @test_num_errors ||= 0
+        if @test_num_errors < 5
+          @test_num_errors += 1
+          raise error_class, error_message
+        else
+          @emit_streams << [tag, es.to_a]
+        end
+      end
+
+      d.run do
+        10.times { |i|
+          File.open("#{TMP_DIR}/tail.txt", "ab") { |f| f.puts "test#{i}" }
+          sleep 0.5
+        }
+        sleep 1
+      end
+
+      d.emits
+    end
+  end
 end

data/test/test_config.rb

@@ -159,8 +159,8 @@ class ConfigTest < Test::Unit::TestCase
   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>"
+      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)

data/test/test_event_router.rb

@@ -1,3 +1,4 @@
+require_relative 'helper'
 require 'fluent/event_router'
 require_relative 'test_plugin_classes'
 

data/test/test_output.rb

@@ -215,13 +215,13 @@ module FluentOutputTest
 
     TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp/time_sliced_output")
 
-    CONFIG = %[]
+    CONFIG = %[buffer_path #{TMP_DIR}/foo]
 
     def create_driver(conf=CONFIG)
       Fluent::Test::TimeSlicedOutputTestDriver.new(Fluent::TimeSlicedOutput).configure(conf, true)
     end
 
-    sub_test_case "test_force_flush" do
+    sub_test_case "force_flush test" do
       setup do
         time = Time.parse("2011-01-02 13:14:15 UTC")
         Timecop.freeze(time)
@@ -235,7 +235,6 @@ module FluentOutputTest
       test "force_flush immediately flushes" do
         d = create_driver(CONFIG + %[
           time_format %Y%m%d%H%M%S
-          buffer_path #{TMP_DIR}/foo
         ])
         d.instance.start
         # buffer should be popped (flushed) immediately
@@ -246,5 +245,30 @@ module FluentOutputTest
         10.times { sleep 0.05 }
       end
     end
+
+    sub_test_case "test emit" do
+      setup do
+        @time = Time.parse("2011-01-02 13:14:15 UTC")
+        Timecop.freeze(@time)
+      end
+
+      teardown do
+        Timecop.return
+      end
+
+      test "emit with valid event" do
+        d = create_driver
+        d.instance.start
+        d.instance.emit('test', OneEventStream.new(@time.to_i, {"message" => "foo"}), NullOutputChain.instance)
+        assert_equal 0, d.instance.log.logs.size
+      end
+
+      test "emit with invalid event" do
+        d = create_driver
+        d.instance.start
+        d.instance.emit('test', OneEventStream.new('string', 10), NullOutputChain.instance)
+        assert_equal 1, d.instance.log.logs.count { |line| line =~ /dump an error event/ }
+      end
+    end
   end
 end

data/test/test_plugin_classes.rb

@@ -1,4 +1,7 @@
 require_relative 'helper'
+require 'fluent/input'
+require 'fluent/output'
+require 'fluent/filter'
 
 module FluentTest
   class FluentTestInput < ::Fluent::Input

data/test/test_process.rb

@@ -1,6 +1,7 @@
 require_relative 'helper'
 require 'fluent/test'
 require 'fluent/event'
+require 'fluent/process'
 require 'stringio'
 require 'msgpack'
 

data/test/test_root_agent.rb

@@ -1,4 +1,6 @@
+require_relative 'helper'
 require 'fluent/event_router'
+require 'fluent/system_config'
 require_relative 'test_plugin_classes'
 
 class RootAgentTest < ::Test::Unit::TestCase
@@ -12,12 +14,12 @@ class RootAgentTest < ::Test::Unit::TestCase
   end
 
   data(
-    'suppress interval' => [{:suppress_interval => 30}, {:@suppress_emit_error_log_interval => 30}],
-    'without source' => [{:without_source => true}, {:@without_source => true}]
+    'suppress interval' => [{'emit_error_log_interval' => 30}, {:@suppress_emit_error_log_interval => 30}],
+    'without source' => [{'without_source' => true}, {:@without_source => true}]
     )
   def test_initialize_with_opt(data)
     opt, expected = data
-    ra = RootAgent.new(opt)
+    ra = RootAgent.new(SystemConfig.new(opt))
     expected.each { |k, v|
       assert_equal v, ra.instance_variable_get(k)
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.20
+  version: 0.12.21
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -391,6 +391,7 @@ files:
 - lib/fluent/rpc.rb
 - lib/fluent/status.rb
 - lib/fluent/supervisor.rb
+- lib/fluent/system_config.rb
 - lib/fluent/test.rb
 - lib/fluent/test/base.rb
 - lib/fluent/test/filter_test.rb