fluentd 0.14.4 → 0.14.5

data/test/plugin/test_out_stdout.rb

@@ -14,70 +14,168 @@ class StdoutOutputTest < Test::Unit::TestCase
     Fluent::Test::Driver::Output.new(Fluent::Plugin::StdoutOutput).configure(conf)
   end
 
-  def test_configure
-    d = create_driver
-    assert_equal [], d.instance.formatter_configs
-  end
+  sub_test_case 'non-buffered' do
+    test 'configure' do
+      d = create_driver
+      assert_equal [], d.instance.formatter_configs
+    end
 
-  def test_configure_output_type
-    d = create_driver(CONFIG + "\noutput_type json")
-    assert_equal 'json', d.instance.formatter_configs.first[:@type]
+    test 'configure output_type' do
+      d = create_driver(CONFIG + "\noutput_type json")
+      assert_equal 'json', d.instance.formatter_configs.first[:@type]
 
-    d = create_driver(CONFIG + "\noutput_type hash")
-    assert_equal 'hash', d.instance.formatter_configs.first[:@type]
+      d = create_driver(CONFIG + "\noutput_type hash")
+      assert_equal 'hash', d.instance.formatter_configs.first[:@type]
 
-    assert_raise(Fluent::ConfigError) do
-      d = create_driver(CONFIG + "\noutput_type foo")
+      assert_raise(Fluent::ConfigError) do
+        d = create_driver(CONFIG + "\noutput_type foo")
+      end
     end
-  end
 
-  def test_emit_in_default
-    d = create_driver
-    time = event_time()
-    out = capture_log do
-      d.run(default_tag: 'test') do
-        d.feed(time, {'test' => 'test1'})
+    test 'emit with default configuration' do
+      d = create_driver
+      time = event_time()
+      out = capture_log do
+        d.run(default_tag: 'test') do
+          d.feed(time, {'test' => 'test1'})
+        end
       end
+      assert_equal "#{Time.at(time).localtime} test: {\"test\":\"test1\"}\n", out
     end
-    assert_equal "#{Time.at(time).localtime} test: {\"test\":\"test1\"}\n", out
-  end
 
-  data('oj' => 'oj', 'yajl' => 'yajl')
-  def test_emit_json(data)
-    d = create_driver(CONFIG + "\noutput_type json\njson_parser #{data}")
-    time = event_time()
-    out = capture_log do
-      d.run(default_tag: 'test') do
-        d.feed(time, {'test' => 'test1'})
+    data('oj' => 'oj', 'yajl' => 'yajl')
+    test 'emit in json format' do |data|
+      d = create_driver(CONFIG + "\noutput_type json\njson_parser #{data}")
+      time = event_time()
+      out = capture_log do
+        d.run(default_tag: 'test') do
+          d.feed(time, {'test' => 'test1'})
+        end
+      end
+      assert_equal "#{Time.at(time).localtime} test: {\"test\":\"test1\"}\n", out
+
+      if data == 'yajl'
+        # NOTE: Float::NAN is not jsonable
+        assert_raise(Yajl::EncodeError) { d.feed('test', time, {'test' => Float::NAN}) }
+      else
+        out = capture_log { d.feed('test', time, {'test' => Float::NAN}) }
+        assert_equal "#{Time.at(time).localtime} test: {\"test\":NaN}\n", out
       end
     end
-    assert_equal "#{Time.at(time).localtime} test: {\"test\":\"test1\"}\n", out
 
-    if data == 'yajl'
-      # NOTE: Float::NAN is not jsonable
-      assert_raise(Yajl::EncodeError) { d.feed('test', time, {'test' => Float::NAN}) }
-    else
+    test 'emit in hash format' do
+      d = create_driver(CONFIG + "\noutput_type hash")
+      time = event_time()
+      out = capture_log do
+        d.run(default_tag: 'test') do
+          d.feed(time, {'test' => 'test2'})
+        end
+      end
+      assert_equal "#{Time.at(time).localtime} test: {\"test\"=>\"test2\"}\n", out
+
+      # NOTE: Float::NAN is not jsonable, but hash string can output it.
       out = capture_log { d.feed('test', time, {'test' => Float::NAN}) }
-      assert_equal "#{Time.at(time).localtime} test: {\"test\":NaN}\n", out
+      assert_equal "#{Time.at(time).localtime} test: {\"test\"=>NaN}\n", out
     end
   end
 
-  def test_emit_hash
-    d = create_driver(CONFIG + "\noutput_type hash")
-    time = event_time()
-    out = capture_log do
-      d.run(default_tag: 'test') do
-        d.feed(time, {'test' => 'test2'})
+  sub_test_case 'buffered' do
+    test 'configure' do
+      d = create_driver(config_element("ROOT", "", {}, [config_element("buffer")]))
+      assert_equal [], d.instance.formatter_configs
+      assert_equal 10 * 1024, d.instance.buffer_config.chunk_limit_size
+      assert d.instance.buffer_config.flush_at_shutdown
+      assert_equal ['tag'], d.instance.buffer_config.chunk_keys
+      assert d.instance.chunk_key_tag
+      assert !d.instance.chunk_key_time
+      assert_equal [], d.instance.chunk_keys
+    end
+
+    test 'configure with output_type' do
+      d = create_driver(config_element("ROOT", "", {"output_type" => "json"}, [config_element("buffer")]))
+      assert_equal 'json', d.instance.formatter_configs.first[:@type]
+
+      d = create_driver(config_element("ROOT", "", {"output_type" => "hash"}, [config_element("buffer")]))
+      assert_equal 'hash', d.instance.formatter_configs.first[:@type]
+
+      assert_raise(Fluent::ConfigError) do
+        create_driver(config_element("ROOT", "", {"output_type" => "foo"}, [config_element("buffer")]))
       end
     end
-    assert_equal "#{Time.at(time).localtime} test: {\"test\"=>\"test2\"}\n", out
 
-    # NOTE: Float::NAN is not jsonable, but hash string can output it.
-    out = capture_log { d.feed('test', time, {'test' => Float::NAN}) }
-    assert_equal "#{Time.at(time).localtime} test: {\"test\"=>NaN}\n", out
-  end
+    sub_test_case "emit with default config" do
+      test '#write(synchronous)' do
+        d = create_driver(config_element("ROOT", "", {}, [config_element("buffer")]))
+        time = event_time()
+
+        out = capture_log do
+          d.run(default_tag: 'test', flush: true) do
+            d.feed(time, {'test' => 'test'})
+          end
+        end
+        assert_equal "#{Time.at(time).localtime} test: {\"test\":\"test\"}\n", out
+      end
+    end
 
-  private
+    sub_test_case "emit json" do
+      data('oj' => 'oj', 'yajl' => 'yajl')
+      test '#write(synchronous)' do |data|
+        d = create_driver(config_element("ROOT", "", {"output_type" => "json", "json_parser" => data}, [config_element("buffer")]))
+        time = event_time()
+
+        out = capture_log do
+          d.run(default_tag: 'test', flush: true) do
+            d.feed(time, {'test' => 'test'})
+          end
+        end
+        assert_equal "#{Time.at(time).localtime} test: {\"test\":\"test\"}\n", out
+      end
+
+      data('oj' => 'oj', 'yajl' => 'yajl')
+      test '#try_write(asynchronous)' do |data|
+        d = create_driver(config_element("ROOT", "", {"output_type" => "json", "json_parser" => data}, [config_element("buffer")]))
+        time = event_time()
+        d.instance.delayed = true
+
+        out = capture_log do
+          d.run(default_tag: 'test', flush: true, shutdown: false) do
+            d.feed(time, {'test' => 'test'})
+          end
+        end
+
+        assert_equal "#{Time.at(time).localtime} test: {\"test\":\"test\"}\n", out
+      end
+    end
+
+    sub_test_case 'emit hash' do
+      test '#write(synchronous)' do
+        d = create_driver(config_element("ROOT", "", {"output_type" => "hash"}, [config_element("buffer")]))
+        time = event_time()
+
+        out = capture_log do
+          d.run(default_tag: 'test', flush: true) do
+            d.feed(time, {'test' => 'test'})
+          end
+        end
+
+        assert_equal "#{Time.at(time).localtime} test: {\"test\"=>\"test\"}\n", out
+      end
+
+      test '#try_write(asynchronous)' do
+        d = create_driver(config_element("ROOT", "", {"output_type" => "hash"}, [config_element("buffer")]))
+        time = event_time()
+        d.instance.delayed = true
+
+        out = capture_log do
+          d.run(default_tag: 'test', flush: true, shutdown: false) do
+            d.feed(time, {'test' => 'test'})
+          end
+        end
+
+        assert_equal "#{Time.at(time).localtime} test: {\"test\"=>\"test\"}\n", out
+      end
+    end
+  end
 
   # Capture the log output of the block given
   def capture_log(&block)

data/test/test_root_agent.rb

@@ -47,6 +47,48 @@ class RootAgentTest < ::Test::Unit::TestCase
       assert_nil ra.error_collector
     end
 
+    test 'raises configuration error for missing type of source' do
+      conf = <<-EOC
+<source>
+</source>
+EOC
+      errmsg = "Missing '@type' parameter on <source> directive"
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        configure_ra(conf)
+      end
+    end
+
+    test 'raises configuration error for missing type of match' do
+      conf = <<-EOC
+<source>
+  @type test_in
+</source>
+<match *.**>
+</match>
+EOC
+      errmsg = "Missing '@type' parameter on <match> directive"
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        configure_ra(conf)
+      end
+    end
+
+    test 'raises configuration error for missing type of filter' do
+      conf = <<-EOC
+<source>
+  @type test_in
+</source>
+<filter *.**>
+</filter>
+<match *.**>
+  @type test_out
+</match>
+EOC
+      errmsg = "Missing '@type' parameter on <filter> directive"
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        configure_ra(conf)
+      end
+    end
+
     test 'with plugins' do
       # check @type and type in one configuration
       conf = <<-EOC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -305,6 +305,9 @@ files:
 - example/copy_roundrobin.conf
 - example/filter_stdout.conf
 - example/in_forward.conf
+- example/in_forward_client.conf
+- example/in_forward_shared_key.conf
+- example/in_forward_users.conf
 - example/in_http.conf
 - example/in_out_forward.conf
 - example/in_syslog.conf
@@ -312,11 +315,15 @@ files:
 - example/in_tcp.conf
 - example/in_udp.conf
 - example/multi_filters.conf
-- example/out_buffered_null.conf
 - example/out_copy.conf
 - example/out_file.conf
 - example/out_forward.conf
 - example/out_forward_buf_file.conf
+- example/out_forward_client.conf
+- example/out_forward_shared_key.conf
+- example/out_forward_users.conf
+- example/out_null.conf
+- example/secondary_file.conf
 - example/v0_12_filter.conf
 - example/v1_literal_example.conf
 - fluent.conf
@@ -416,8 +423,6 @@ files:
 - lib/fluent/plugin/in_unix.rb
 - lib/fluent/plugin/input.rb
 - lib/fluent/plugin/multi_output.rb
-- lib/fluent/plugin/out_buffered_null.rb
-- lib/fluent/plugin/out_buffered_stdout.rb
 - lib/fluent/plugin/out_copy.rb
 - lib/fluent/plugin/out_exec.rb
 - lib/fluent/plugin/out_exec_filter.rb
@@ -426,6 +431,7 @@ files:
 - lib/fluent/plugin/out_null.rb
 - lib/fluent/plugin/out_relabel.rb
 - lib/fluent/plugin/out_roundrobin.rb
+- lib/fluent/plugin/out_secondary_file.rb
 - lib/fluent/plugin/out_stdout.rb
 - lib/fluent/plugin/out_stream.rb
 - lib/fluent/plugin/output.rb
@@ -486,6 +492,7 @@ files:
 - lib/fluent/test/log.rb
 - lib/fluent/test/output_test.rb
 - lib/fluent/test/parser_test.rb
+- lib/fluent/test/startup_shutdown.rb
 - lib/fluent/time.rb
 - lib/fluent/timezone.rb
 - lib/fluent/unique_id.rb
@@ -544,8 +551,6 @@ files:
 - test/plugin/test_in_unix.rb
 - test/plugin/test_input.rb
 - test/plugin/test_multi_output.rb
-- test/plugin/test_out_buffered_null.rb
-- test/plugin/test_out_buffered_stdout.rb
 - test/plugin/test_out_copy.rb
 - test/plugin/test_out_exec.rb
 - test/plugin/test_out_exec_filter.rb
@@ -554,6 +559,7 @@ files:
 - test/plugin/test_out_null.rb
 - test/plugin/test_out_relabel.rb
 - test/plugin/test_out_roundrobin.rb
+- test/plugin/test_out_secondary_file.rb
 - test/plugin/test_out_stdout.rb
 - test/plugin/test_out_stream.rb
 - test/plugin/test_output.rb
@@ -693,8 +699,6 @@ test_files:
 - test/plugin/test_in_unix.rb
 - test/plugin/test_input.rb
 - test/plugin/test_multi_output.rb
-- test/plugin/test_out_buffered_null.rb
-- test/plugin/test_out_buffered_stdout.rb
 - test/plugin/test_out_copy.rb
 - test/plugin/test_out_exec.rb
 - test/plugin/test_out_exec_filter.rb
@@ -703,6 +707,7 @@ test_files:
 - test/plugin/test_out_null.rb
 - test/plugin/test_out_relabel.rb
 - test/plugin/test_out_roundrobin.rb
+- test/plugin/test_out_secondary_file.rb
 - test/plugin/test_out_stdout.rb
 - test/plugin/test_out_stream.rb
 - test/plugin/test_output.rb

data/lib/fluent/plugin/out_buffered_null.rb

@@ -1,59 +0,0 @@
-#
-# Fluentd
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-require 'fluent/plugin/output'
-
-module Fluent::Plugin
-  class BufferedNullOutput < Output
-    # This plugin is for tests of buffer plugins
-
-    Fluent::Plugin.register_output('buffered_null', self)
-
-    config_section :buffer do
-      config_set_default :chunk_keys, ['tag']
-      config_set_default :flush_at_shutdown, true
-      config_set_default :chunk_limit_size, 10 * 1024
-    end
-
-    attr_accessor :feed_proc, :delayed
-
-    def initialize
-      super
-      @delayed = false
-      @feed_proc = nil
-    end
-
-    def prefer_delayed_commit
-      @delayed
-    end
-
-    def write(chunk)
-      if @feed_proc
-        @feed_proc.call(chunk)
-      else
-        # ignore chunk.read
-      end
-    end
-
-    def try_write(chunk)
-      if @feed_proc
-        @feed_proc.call(chunk)
-      else
-        # ignore chunk.read
-      end
-    end
-  end
-end

data/lib/fluent/plugin/out_buffered_stdout.rb

@@ -1,70 +0,0 @@
-#
-# Fluentd
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-require 'fluent/plugin/output'
-
-module Fluent::Plugin
-  class BufferedStdoutOutput < Output
-    Fluent::Plugin.register_output('buffered_stdout', self)
-
-    helpers :formatter, :inject, :compat_parameters
-
-    config_section :buffer do
-      config_set_default :chunk_keys, ['tag']
-      config_set_default :flush_at_shutdown, true
-      config_set_default :chunk_limit_size, 10 * 1024
-    end
-
-    DEFAULT_FORMAT_TYPE = 'json'
-
-    config_section :format do
-      config_set_default :@type, DEFAULT_FORMAT_TYPE
-    end
-
-    attr_accessor :delayed
-
-    def initialize
-      super
-      @delayed = false
-    end
-
-    def prefer_delayed_commit
-      @delayed
-    end
-
-    def configure(conf)
-      if conf['output_type'] && !conf['format']
-        conf['format'] = conf['output_type']
-      end
-      compat_parameters_convert(conf, :inject, :formatter)
-      super
-      @formatter = formatter_create(conf: conf.elements('format').first, default_type: DEFAULT_FORMAT_TYPE)
-    end
-
-    def write(chunk)
-      chunk.write_to($log)
-    end
-
-    def try_write(chunk)
-      chunk.write_to($log)
-    end
-
-    def format(tag, time, record)
-      record = inject_values_to_record(tag, time, record)
-      "#{Time.at(time).localtime} #{tag}: #{@formatter.format(tag, time, record).chomp}\n"
-    end
-  end
-end