Update lib/fluent/supervisor.rb

Co-authored-by: Daijiro Fukuda <[email protected]>
Signed-off-by: Kentaro Hayashi <[email protected]>

Author: kenhys

lib/fluent/supervisor.rb

@@ -1207,7 +1207,7 @@ def build_system_config(conf)
 
     def build_additional_configurations
       if @system_config.config_include_dir&.empty?
-        $log.info :supervisor, 'default configuration include directory was disabled'
+        $log.info :supervisor, 'configuration include directory is disabled'
         return
       end
       begin
@@ -1218,9 +1218,9 @@ def build_additional_configurations
           # Thus, it does not care whether @config_path is .conf or .yml.
           $log.info :supervisor, 'loading additional configuration file', path: path
           yield Fluent::Config.build(config_path: path,
-                                         encoding: @conf_encoding,
-                                         use_v1_config: @use_v1_config,
-                                         type: :guess)
+                                     encoding: @conf_encoding,
+                                     use_v1_config: @use_v1_config,
+                                     type: :guess)
         end
       rescue Errno::ENOENT
         $log.info :supervisor, 'inaccessible include directory was specified', path: @system_config.config_include_dir

test/command/test_fluentd.rb

@@ -1570,9 +1570,9 @@ def create_config_include_dir_configuration(config_path, config_dir, yaml_format
                          "[info]: inaccessible include directory was specified")
     end
 
-    data("include additional configuration with relative conf.d" => [{"relative_path" => true}],
-         "include additional configuration with full-path conf.d" => [{"relative_path" => false}])
-    test "additional configuration file (conf.d/child.conf) was loaded" do |(option)|
+    data("include additional configuration with relative conf.d" => {"relative_path" => true},
+         "include additional configuration with full-path conf.d" => {"relative_path" => false})
+    test "additional configuration file (conf.d/child.conf) was loaded" do |option|
       conf_dir = option["relative_path"] ? "conf.d" : "#{@tmp_dir}/conf.d"
       conf_path = create_config_include_dir_configuration("parent.conf", conf_dir)
       create_conf_file('conf.d/child.conf', "")
@@ -1598,9 +1598,9 @@ def create_config_include_dir_configuration(config_path, config_dir, yaml_format
                          "[info]: inaccessible include directory was specified")
     end
 
-    data("include additional YAML configuration with relative conf.d" => [{"relative_path" => true}],
-         "include additional YAML configuration with full path conf.d" => [{"relative_path" => false}])
-    test "additional relative configuration file (conf.d/child.yml) was loaded" do |(option)|
+    data("include additional YAML configuration with relative conf.d" => {"relative_path" => true},
+         "include additional YAML configuration with full path conf.d" => {"relative_path" => false})
+    test "additional relative configuration file (conf.d/child.yml) was loaded" do |option|
       conf_dir = option["relative_path"] ? "conf.d" : "#{@tmp_dir}/conf.d"
       conf_path = create_config_include_dir_configuration("parent.yml", conf_dir, true)
       create_conf_file('conf.d/child.yml', "")