Merge pull request #2807 from ganmacs/multiple-values-in-RUBYOPT-env-var

Split RUBYOPT with space

lib/fluent/supervisor.rb

@@ -661,7 +661,9 @@ def supervise
 
       rubyopt = ENV["RUBYOPT"]
       fluentd_spawn_cmd = [ServerEngine.ruby_bin_path, "-Eascii-8bit:ascii-8bit"]
-      fluentd_spawn_cmd << rubyopt if rubyopt
+      if rubyopt
+        fluentd_spawn_cmd.concat(rubyopt.split(' '))
+      end
       fluentd_spawn_cmd << $0
       fluentd_spawn_cmd += $fluentdargv
       fluentd_spawn_cmd << "--under-supervisor"

test/command/test_fluentd.rb

@@ -50,13 +50,11 @@ def create_cmdline(conf_path, *fluentd_options)
     ["bundle", "exec", "ruby", cmd_path, "-c", conf_path, *fluentd_options]
   end
 
-  def execute_command(cmdline, chdir=TMP_DIR)
+  def execute_command(cmdline, chdir=TMP_DIR, env = {})
     null_stream = File.open(File::NULL, 'w')
     gemfile_path = File.expand_path(File.dirname(__FILE__) + "../../../Gemfile")
 
-    env = {
-      "BUNDLE_GEMFILE" => gemfile_path,
-    }
+    env = { "BUNDLE_GEMFILE" => gemfile_path }.merge(env)
     cmdname = cmdline.shift
     arg0 = "testing-fluentd"
     # p(here: "executing process", env: env, cmdname: cmdname, arg0: arg0, args: cmdline)
@@ -81,12 +79,12 @@ def execute_command(cmdline, chdir=TMP_DIR)
     null_stream.close rescue nil
   end
 
-  def assert_log_matches(cmdline, *pattern_list, patterns_not_match: [], timeout: 10)
+  def assert_log_matches(cmdline, *pattern_list, patterns_not_match: [], timeout: 10, env: {})
     matched = false
     assert_error_msg = "matched correctly"
     stdio_buf = ""
     begin
-      execute_command(cmdline) do |pid, stdout|
+      execute_command(cmdline, TMP_DIR, env) do |pid, stdout|
         begin
           waiting(timeout) do
             while process_exist?(pid) && !matched
@@ -780,6 +778,25 @@ def multi_workers_ready?
       )
     end
 
+    test "multiple values are set to RUBYOPT" do
+      conf = <<CONF
+<source>
+  @type dummy
+  tag dummy
+</source>
+<match>
+  @type null
+</match>
+CONF
+      conf_path = create_conf_file('rubyopt_test.conf', conf)
+      assert_log_matches(
+        create_cmdline(conf_path),
+        '#0 fluentd worker is now running worker=0',
+        patterns_not_match: ['(LoadError)'],
+        env: { 'RUBYOPT' => '-rtest-unit -rbundler/setup' },
+      )
+    end
+
     test 'success to start workers when file buffer is configured in non-workers way only for specific worker' do
       conf = <<CONF
 <system>