Merge pull request #1093 from fluent/fix-bug-rpc-config-reload

Fix regression about RPC /api/config.reload
fluent · Jul 20, 2016 · d9cb550 · d9cb550
2 parents 85dd918 + 7246d6a
commit d9cb550
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/example/in_forward.conf b/example/in_forward.conf
@@ -1,3 +1,7 @@
+<system>
+  rpc_endpoint 0.0.0.0:24444
+</system>
+
 <source>
   @type forward
 </source>

diff --git a/lib/fluent/supervisor.rb b/lib/fluent/supervisor.rb
@@ -114,12 +114,21 @@ def stop_rpc_server
     end
 
     def install_supervisor_signal_handlers
+      trap :HUP do
+        $log.debug "fluentd supervisor process get SIGHUP"
+        supervisor_sighup_handler
+      end unless Fluent.windows?
+
       trap :USR1 do
         $log.debug "fluentd supervisor process get SIGUSR1"
         supervisor_sigusr1_handler
       end unless Fluent.windows?
     end
 
+    def supervisor_sighup_handler
+      kill_worker
+    end
+
     def supervisor_sigusr1_handler
       if log = config[:logger_initializer]
         log.reopen!
@@ -136,7 +145,7 @@ def kill_worker
         if Fluent.windows?
           Process.kill :KILL, pid
         else
-          Process.kill :INT, pid
+          Process.kill :TERM, pid
         end
       end
     end