fluentd 1.9.2 → 1.9.3

data/test/plugin_helper/data/cert/without_ca/cert.pem

@@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgILAL/IBPUBfvN0YjkwDQYJKoZIhvcNAQELBQAwVzELMAkG
+MIIDVTCCAj2gAwIBAgILALCfeVLdPoGOQEcwDQYJKoZIhvcNAQELBQAwVzELMAkG
 A1UEBhMCVVMxCzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MSMw
-IQYDVQQDDBpzZXJ2ZXIudGVzdGluZy5mbHVlbnRkLm9yZzAeFw03MDAxMDEwMDAw
-MDBaFw0yMDAyMjEwNzEzMjhaMFcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEW
-MBQGA1UEBwwNTW91bnRhaW4gVmlldzEjMCEGA1UEAwwac2VydmVyLnRlc3Rpbmcu
-Zmx1ZW50ZC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaAQiU
-VPe4LFp438/nU+fTEIaqpK9tD9gF/ghO6Ce8pZrB5uXH7xCT7UGO29YPtzoNfouL
-9nwMOWZuvbLV2MQ4fh2zC7GvM5xyYvlkmSXqfjanPTNpvXcXMUQcbceZBa2EbHFl
-gew8vUf57Ip8hL2rbI6d7YPBXQ0NX6QsD45Eg7vGyulO+E6aNWvkAdQTMs62Jz8e
-N6emd1NuDp5kS5DKLwx8cuXmdREZrADf777NfHbji+uhBk0EKuIIIMlxvPCJsyby
-YafKGQosXQWWX6rKlCnMmLUnG7ZXkCR+j1XYrdqnV53qpFv6ILr2iSFs1t9GOq54
-7HRBwSX0oKv0poW5AgMBAAGjIDAeMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQD
-AgZAMA0GCSqGSIb3DQEBCwUAA4IBAQBNTGk7fRzm/5iUH52xvJWcDk3s2ch/VNUS
-satPLl/pgc/lPnQzMGZAT++3KRx0TZ3hSiFHvrzOeIQW7uUpGoM4/URtXtdD/Zwh
-2U5p+kc63az8gkfos8S3zKu2m5qY+c8Z+c9UCqfAEq58byY64yGclxU3I1MKyJiK
-bETvNLJDMT2SXxLoWLKk87ezlN0mkwhs9rhOwTp5OPxvTi1Y/afOX3V/lhnw24gX
-0mauGW7aaY7MFqolZOO3mTMhIDvMZVCCSjPBULB4OcpF8dpfpM0OvdPnGgiK8Cz3
-Lm8burtm57n3nme/hX/8qLIDs91HCrPP1R/jEbugapHJ3f6JRdTJ
+IQYDVQQDDBpzZXJ2ZXIudGVzdGluZy5mbHVlbnRkLm9yZzAgFw03MDAxMDEwMDAw
+MDBaGA8yMTE4MDkxOTA2MDQ1NlowVzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNB
+MRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MSMwIQYDVQQDDBpzZXJ2ZXIudGVzdGlu
+Zy5mbHVlbnRkLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/f
+VVxZDKnU//+KdJV0yJQOvLT95E0wJmHpsot519iuSNNzCzvTl6VOqzT/yQN/X4dm
+5PPZWvJdY5Q0c1DvnSsWGZ8mdAZ2Ank7EjOSZyfekve3FRGUUanbaQK4yqWiC93Z
+50pNI/uu3vpcY/2Gyos3BK7740Z7ytD+xeSbW7rFEDEIC1BtT8DL4ojZKz+NA4ij
+mIxGkmFUh/VbQYA19MdaC4ywWVEuxw+5bztHEiJXB57NDTcsZa4mwz1tFSoOMGxG
+tamaVRZcUh7nX4v2VCpQJvCG+4zeHc6QPaTK4RQZf70rZ1qXM2GIN53B4TKOhDsc
+gcslfohL/bUeMp2zruUCAwEAAaMgMB4wCQYDVR0TBAIwADARBglghkgBhvhCAQEE
+BAMCBkAwDQYJKoZIhvcNAQELBQADggEBAJ5U5HGK2lmK6NKQGw63tbBqQ38tSCix
+a3OwOQ9M4KeVGgAiG6fgESgv0AAN37pzoNRQ1soPOIazovdsbKUcec/cbMQoODuO
+g9KqueecB0BkSgIQXJWtoFWn1m9I/11VnbCbv1fYsui5fKANL9V6QUa052oNu1X+
+8I6FQpgzcY3sGw8jiu1sQYBg6wIQJfl4bf6wQBqVhUeaSeY++1F1SNuB0k6H2DgA
+OgGULEvcIb0dvSh/luOpIHoUsyv77aKWnC3LSwUD/M8/Lv43bcJKfDT2KjLeW8DX
+lCMESmm0ppShIa/fobNxq2Ale6oFxHma2t7pG8ZxCxn5ojiFQ3R6Lz0=
 -----END CERTIFICATE-----

data/test/plugin_helper/test_http_server_helper.rb

@@ -161,20 +161,12 @@ class HtttpHelperTest < Test::Unit::TestCase
         assert_equal(nil, resp.body)
         assert_equal('text/plain', resp['Content-Type'])
 
-        %w[get put post put delete trace].each do |n|
+        %w[get put post put delete options trace].each do |n|
           resp = send(n, "http://127.0.0.1:#{PORT}/example/hello")
           assert_equal('200', resp.code)
           assert_equal("hello #{n}", resp.body)
           assert_equal('text/plain', resp['Content-Type'])
         end
-
-        # TODO: remove when fluentd drop ruby 2.1
-        if Gem::Version.create(RUBY_VERSION) >= Gem::Version.create('2.2.0')
-          resp = options("http://127.0.0.1:#{PORT}/example/hello")
-          assert_equal('200', resp.code)
-          assert_equal("hello options", resp.body)
-          assert_equal('text/plain', resp['Content-Type'])
-        end
       end
     end
 

data/test/test_logger_initializer.rb

@@ -17,10 +17,30 @@ class LoggerInitializerTest < ::Test::Unit::TestCase
 
     assert_false File.exist?(TMP_DIR)
     logger = Fluent::Supervisor::LoggerInitializer.new(path, Fluent::Log::LEVEL_DEBUG, nil, nil, {})
+    mock.proxy(File).chmod(0o777, TMP_DIR).never
 
     assert_nothing_raised do
       logger.init(:supervisor, 0)
     end
+
+    assert_true File.exist?(TMP_DIR)
+  end
+
+  test 'apply_options with log_dir_perm' do
+    omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
+
+    path = File.join(TMP_DIR, 'fluent_with_path.log')
+
+    assert_false File.exist?(TMP_DIR)
+    logger = Fluent::Supervisor::LoggerInitializer.new(path, Fluent::Log::LEVEL_DEBUG, nil, nil, {})
+    mock.proxy(File).chmod(0o777, TMP_DIR).once
+
+    assert_nothing_raised do
+      logger.init(:supervisor, 0)
+    end
+
+    logger.apply_options(log_dir_perm: 0o777)
     assert_true File.exist?(TMP_DIR)
+    assert_equal 0o777, (File.stat(TMP_DIR).mode & 0xFFF)
   end
 end

data/test/test_plugin_id.rb

@@ -97,5 +97,23 @@ class PluginIdTest < Test::Unit::TestCase
         ENV['SERVERENGINE_WORKER_ID'] = prev_env_val
       end
     end
+
+    test '#plugin_root_dir create dirctory with specify mode if not exists ' do
+      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
+
+      root_dir = Fluent::SystemConfig.overwrite_system_config({ 'root_dir' => File.join(TMP_DIR, "myroot"), 'dir_permission' => '0777' }) do
+        @p.plugin_root_dir
+      end
+
+      assert_equal '777', File.stat(root_dir).mode.to_s(8)[-3, 3]
+    end
+
+    test '#plugin_root_dir create dirctory with default permission if not exists ' do
+      root_dir = Fluent::SystemConfig.overwrite_system_config({ 'root_dir' => File.join(TMP_DIR, "myroot") }) do
+        @p.plugin_root_dir
+      end
+
+      assert_equal '755', File.stat(root_dir).mode.to_s(8)[-3, 3]
+    end
   end
 end

data/test/test_supervisor.rb

@@ -161,7 +161,7 @@ class SupervisorTest < ::Test::Unit::TestCase
 
     assert{ $log.out.logs.first.end_with?(info_msg) }
   ensure
-    $log.out.reset
+    $log.out.reset if $log.out.is_a?(Fluent::Test::DummyLogDevice)
   end
 
   def test_load_config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack