fluentd 0.12.40 → 0.14.0

data/lib/fluent/supervisor.rb

@@ -17,12 +17,6 @@
 require 'etc'
 require 'fcntl'
 
-begin
-  require 'sigdump/setup'
-rescue Exception
-  # ignore LoadError and others (related with signals): it may raise these errors in Windows
-end
-
 require 'fluent/config'
 require 'fluent/env'
 require 'fluent/engine'
@@ -30,25 +24,225 @@ require 'fluent/log'
 require 'fluent/plugin'
 require 'fluent/rpc'
 require 'fluent/system_config'
+require 'serverengine'
+require 'shellwords'
+
+if Fluent.windows?
+  require 'windows/library'
+  require 'windows/system_info'
+  include Windows::Library
+  include Windows::SystemInfo
+  require 'win32/ipc'
+  require 'win32/event'
+end
 
 module Fluent
-  class Supervisor
-    def self.get_etc_passwd(user)
-      if user.to_i.to_s == user
-        Etc.getpwuid(user.to_i)
-      else
-        Etc.getpwnam(user)
+  module ServerModule
+    def before_run
+      @start_time = Time.now
+
+      if config[:rpc_endpoint]
+        @rpc_endpoint = config[:rpc_endpoint]
+        @enable_get_dump = config[:enable_get_dump]
+        run_rpc_server
       end
+      install_supervisor_signal_handlers
+
+      socket_manager_path = ServerEngine::SocketManager::Server.generate_path
+      ServerEngine::SocketManager::Server.open(socket_manager_path)
+      ENV['SERVERENGINE_SOCKETMANAGER_PATH'] = socket_manager_path.to_s
     end
 
-    def self.get_etc_group(group)
-      if group.to_i.to_s == group
-        Etc.getgrgid(group.to_i)
-      else
-        Etc.getgrnam(group)
+    def after_run
+      if Time.now - @start_time < 1
+        $log.warn "process died within 1 second. exit."
+      end
+
+      stop_rpc_server if @rpc_endpoint
+    end
+
+    def run_rpc_server
+      @rpc_server = RPC::Server.new(@rpc_endpoint, $log)
+
+      # built-in RPC for signals
+      @rpc_server.mount_proc('/api/processes.interruptWorkers') { |req, res|
+        $log.debug "fluentd RPC got /api/processes.interruptWorkers request"
+        Process.kill :INT, $$
+        nil
+      }
+      @rpc_server.mount_proc('/api/processes.killWorkers') { |req, res|
+        $log.debug "fluentd RPC got /api/processes.killWorkers request"
+        Process.kill :TERM, $$
+        nil
+      }
+      @rpc_server.mount_proc('/api/plugins.flushBuffers') { |req, res|
+        $log.debug "fluentd RPC got /api/plugins.flushBuffers request"
+        unless Fluent.windows?
+          Process.kill :USR1, $$
+        end
+        nil
+      }
+      @rpc_server.mount_proc('/api/config.reload') { |req, res|
+        $log.debug "fluentd RPC got /api/config.reload request"
+        if Fluent.windows?
+          # restart worker with auto restarting by killing
+          kill_worker
+        else
+          Process.kill :HUP, $$
+        end
+        nil
+      }
+      @rpc_server.mount_proc('/api/config.dump') { |req, res|
+        $log.debug "fluentd RPC got /api/config.dump request"
+        $log.info "dump in-memory config"
+        supervisor_dump_config_handler
+        nil
+      }
+
+      @rpc_server.mount_proc('/api/config.getDump') { |req, res|
+        $log.debug "fluentd RPC got /api/config.dump request"
+        $log.info "get dump in-memory config via HTTP"
+        res.body = supervisor_get_dump_config_handler
+        [nil, nil, res]
+      } if @enable_get_dump
+
+      @rpc_server.start
+    end
+
+    def stop_rpc_server
+      @rpc_server.shutdown
+    end
+
+    def install_supervisor_signal_handlers
+      trap :USR1 do
+        $log.debug "fluentd supervisor process get SIGUSR1"
+        supervisor_sigusr1_handler
+      end unless Fluent.windows?
+    end
+
+    def supervisor_sigusr1_handler
+      if log = config[:logger_initializer]
+        log.reopen!
+      end
+
+      if pid = config[:worker_pid]
+        Process.kill(:USR1, pid)
+        # don't rescue Erro::ESRSH here (invalid status)
       end
     end
 
+    def kill_worker
+      if pid = config[:worker_pid]
+        if Fluent.windows?
+          Process.kill :KILL, pid
+        else
+          Process.kill :INT, pid
+        end
+      end
+    end
+
+    def supervisor_dump_config_handler
+      $log.info config[:fluentd_conf].to_s
+    end
+
+    def supervisor_get_dump_config_handler
+      {conf: config[:fluentd_conf].to_s}
+    end
+  end
+
+  module WorkerModule
+    def spawn(process_manager)
+      main_cmd = config[:main_cmd]
+      @pm = process_manager.spawn(main_cmd)
+    end
+
+    def after_start
+      config[:worker_pid] = @pm.pid
+    end
+  end
+
+  class Supervisor
+    def self.load_config(path, params = {})
+
+      pre_loadtime = 0
+      pre_loadtime = params['pre_loadtime'].to_i if params['pre_loadtime']
+      pre_config_mtime = nil
+      pre_config_mtime = params['pre_config_mtime'] if params['pre_config_mtime']
+      config_mtime = File.mtime(path)
+
+      # reuse previous config if last load time is within 5 seconds and mtime of the config file is not changed
+      if Time.now - Time.at(pre_loadtime) < 5 and config_mtime == pre_config_mtime
+        return params['pre_conf']
+      end
+
+      config_fname = File.basename(path)
+      config_basedir = File.dirname(path)
+      config_data = File.read(path)
+      inline_config = params['inline_config']
+      if inline_config == '-'
+        config_data << "\n" << STDIN.read
+      elsif inline_config
+        config_data << "\n" << inline_config.gsub("\\n","\n")
+      end
+      fluentd_conf = Fluent::Config.parse(config_data, config_fname, config_basedir, params['use_v1_config'])
+      system_config = SystemConfig.create(fluentd_conf)
+
+      log_level = system_config.log_level || params['log_level']
+      suppress_repeated_stacktrace = system_config.suppress_repeated_stacktrace || params['suppress_repeated_stacktrace']
+      log_path = params['log_path']
+      chuser = params['chuser']
+      chgroup = params['chgroup']
+      rpc_endpoint = system_config.rpc_endpoint
+      enable_get_dump = system_config.enable_get_dump
+
+      log_opts = {suppress_repeated_stacktrace: suppress_repeated_stacktrace}
+      logger_initializer = Supervisor::LoggerInitializer.new(log_path, log_level, chuser, chgroup, log_opts)
+      # this #init sets initialized logger to $log
+      logger_initializer.init
+      logger = $log
+
+      daemonize = params.fetch('daemonize', false)
+      main_cmd = params['main_cmd']
+
+      se_config = {
+          worker_type: 'spawn',
+          workers: 1,
+          log_stdin: false,
+          log_stdout: false,
+          log_stderr: false,
+          enable_heartbeat: true,
+          auto_heartbeat: false,
+          logger: logger,
+          log: logger.out,
+          log_path: log_path,
+          log_level: log_level,
+          logger_initializer: logger_initializer,
+          chuser: chuser,
+          chgroup: chgroup,
+          suppress_repeated_stacktrace: suppress_repeated_stacktrace,
+          daemonize: daemonize,
+          rpc_endpoint: rpc_endpoint,
+          enable_get_dump: enable_get_dump,
+          windows_daemon_cmdline: [ServerEngine.ruby_bin_path,
+                                   File.join(File.dirname(__FILE__), 'daemon.rb'),
+                                   ServerModule.name,
+                                   WorkerModule.name,
+                                   path,
+                                   JSON.dump(params)],
+          fluentd_conf: fluentd_conf,
+          main_cmd: main_cmd,
+      }
+      pre_params = params.dup
+      params['pre_loadtime'] = Time.now.to_i
+      params['pre_config_mtime'] = config_mtime
+      params['pre_conf'] = se_config
+      # prevent pre_conf from being too big by reloading many times.
+      pre_params['pre_conf'] = nil
+      params['pre_conf'][:windows_daemon_cmdline][5] = JSON.dump(pre_params)
+
+      return se_config
+    end
+
     class LoggerInitializer
       def initialize(path, level, chuser, chgroup, opts)
         @path = path
@@ -62,15 +256,19 @@ module Fluent
         if @path && @path != "-"
           @io = File.open(@path, "a")
           if @chuser || @chgroup
-            chuid = @chuser ? Supervisor.get_etc_passwd(@chuser).uid : nil
-            chgid = @chgroup ? Supervisor.get_etc_group(@chgroup).gid : nil
+            chuid = @chuser ? ServerEngine::Daemon.get_etc_passwd(@chuser).uid : nil
+            chgid = @chgroup ? ServerEngine::Daemon.get_etc_group(@chgroup).gid : nil
             File.chown(chuid, chgid, @path)
           end
         else
           @io = STDOUT
         end
 
-        $log = Fluent::Log.new(@io, @level, @opts)
+        dl_opts = {}
+        # subtract 1 to match serverengine daemon logger side logging severity.
+        dl_opts[:log_level] = @level - 1
+        logger = ServerEngine::DaemonLogger.new(@io, dl_opts)
+        $log = Fluent::Log.new(logger, @opts)
         $log.enable_color(false) if @path
         $log.enable_debug if @level <= Fluent::Log::LEVEL_DEBUG
       end
@@ -108,6 +306,8 @@ module Fluent
         without_source: false,
         use_v1_config: true,
         supervise: true,
+        signame: nil,
+        winsvcreg: nil,
       }
     end
 
@@ -131,53 +331,22 @@ module Fluent
       @suppress_interval = opt[:suppress_interval]
       @suppress_config_dump = opt[:suppress_config_dump]
       @without_source = opt[:without_source]
+      @signame = opt[:signame]
 
-      log_opts = {suppress_repeated_stacktrace: opt[:suppress_repeated_stacktrace]}
+      @suppress_repeated_stacktrace = opt[:suppress_repeated_stacktrace]
+      log_opts = {suppress_repeated_stacktrace: @suppress_repeated_stacktrace}
       @log = LoggerInitializer.new(@log_path, @log_level, @chuser, @chgroup, log_opts)
       @finished = false
-      @main_pid = nil
     end
 
-    def start
+    def run_supervisor
       @log.init
       show_plugin_config if @show_plugin_config
       read_config
       set_system_config
 
       dry_run if @dry_run
-      start_daemonize if @daemonize
-      setup_rpc_server if @rpc_endpoint
-      setup_rpc_get_dump if @enable_get_dump
-
-      if @supervise
-        install_supervisor_signal_handlers
-        run_rpc_server if @rpc_endpoint
-        until @finished
-          supervise do
-            change_privilege
-            init_engine
-            install_main_process_signal_handlers
-            run_configure
-            finish_daemonize if @daemonize
-            run_engine
-            exit 0
-          end
-          $log.error "fluentd main process died unexpectedly. restarting." unless @finished
-        end
-      else
-        $log.info "starting fluentd-#{Fluent::VERSION} without supervision"
-        run_rpc_server if @rpc_endpoint
-        main_process do
-          change_privilege
-          init_engine
-          install_main_process_signal_handlers
-          run_configure
-          finish_daemonize if @daemonize
-          run_engine
-          exit 0
-        end
-      end
-      stop_rpc_server if @rpc_endpoint
+      supervise
     end
 
     def options
@@ -189,14 +358,38 @@ module Fluent
       }
     end
 
+    def run_worker
+      begin
+        require 'sigdump/setup'
+      rescue Exception
+        # ignore LoadError and others (related with signals): it may raise these errors in Windows
+      end
+      @log.init
+      Process.setproctitle("worker:#{@process_name}") if @process_name
+
+      show_plugin_config if @show_plugin_config
+      read_config
+      set_system_config
+
+      install_main_process_signal_handlers
+
+      $log.info "starting fluentd-#{Fluent::VERSION} without supervision"
+
+      main_process do
+        change_privilege
+        init_engine
+        run_configure
+        run_engine
+        exit 0
+      end
+    end
+
     private
 
     def dry_run
       $log.info "starting fluentd-#{Fluent::VERSION} as dry run mode"
-
       change_privilege
       init_engine
-      install_main_process_signal_handlers
       run_configure
       exit 0
     rescue => e
@@ -206,6 +399,8 @@ module Fluent
 
     def show_plugin_config
       $log.info "Show config for #{@show_plugin_config}"
+      @system_config = SystemConfig.new
+      init_engine
       name, type = @show_plugin_config.split(":")
       plugin = Plugin.__send__("new_#{name}", type)
       dumped_config = "\n"
@@ -227,136 +422,84 @@ module Fluent
       exit 1
     end
 
-    def start_daemonize
-      @wait_daemonize_pipe_r, @wait_daemonize_pipe_w = IO.pipe
-
-      if fork
-        # console process
-        @wait_daemonize_pipe_w.close
-        @wait_daemonize_pipe_w = nil
-        wait_daemonize
-        exit 0
-      end
-
-      # daemonize intermediate process
-      @wait_daemonize_pipe_r.close
-      @wait_daemonize_pipe_r = nil
-
-      # in case the child process forked during run_configure
-      @wait_daemonize_pipe_w.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-
-      Process.setsid
-      exit!(0) if fork
-      File.umask(0)
-
-      # supervisor process
-      @supervisor_pid = Process.pid
-    end
+    def supervise
+      $log.info "starting fluentd-#{Fluent::VERSION}"
 
-    def wait_daemonize
-      supervisor_pid = @wait_daemonize_pipe_r.read
-      if supervisor_pid.empty?
-        # initialization failed
-        exit! 1
+      if Fluent.windows?
+        fluentd_spawn_cmd = ServerEngine.ruby_bin_path + " -Eascii-8bit:ascii-8bit "
+        fluentd_spawn_cmd << ' "' + $0.gsub('"', '""') + '" '
+        $fluentdargv.each{|a|
+          fluentd_spawn_cmd << ('"' + a.gsub('"', '""') + '" ')
+        }
+      else
+        fluentd_spawn_cmd = ServerEngine.ruby_bin_path + " -Eascii-8bit:ascii-8bit "
+        fluentd_spawn_cmd << $0.shellescape + ' '
+        $fluentdargv.each{|a|
+          fluentd_spawn_cmd << (a.shellescape + " ")
+        }
       end
 
-      @wait_daemonize_pipe_r.close
-      @wait_daemonize_pipe_r = nil
-
-      # write pid file
-      File.open(@daemonize, "w") {|f|
-        f.write supervisor_pid
+      fluentd_spawn_cmd << ("--no-supervisor")
+      $log.info "spawn command to main: " + fluentd_spawn_cmd
+
+      params = {}
+      params['main_cmd'] = fluentd_spawn_cmd
+      params['daemonize'] = @daemonize
+      params['inline_config'] = @inline_config
+      params['log_path'] = @log_path
+      params['log_level'] = @log_level
+      params['chuser'] = @chuser
+      params['chgroup'] = @chgroup
+      params['use_v1_config'] = @use_v1_config
+      params['suppress_repeated_stacktrace'] = @suppress_repeated_stacktrace
+
+      se = ServerEngine.create(ServerModule, WorkerModule){
+        Fluent::Supervisor.load_config(@config_path, params)
       }
+      se.run
     end
 
-    def finish_daemonize
-      if @wait_daemonize_pipe_w
-        STDIN.reopen("/dev/null")
-        STDOUT.reopen("/dev/null", "w")
-        STDERR.reopen("/dev/null", "w")
-        @wait_daemonize_pipe_w.write @supervisor_pid.to_s
-        @wait_daemonize_pipe_w.close
-        @wait_daemonize_pipe_w = nil
-      end
-    end
-
-    def setup_rpc_server
-      @rpc_server = RPC::Server.new(@rpc_endpoint, $log)
-
-      # built-in RPC for signals
-      @rpc_server.mount_proc('/api/processes.interruptWorkers') { |req, res|
-        $log.debug "fluentd RPC got /api/processes.interruptWorkers request"
-        supervisor_sigint_handler
-        nil
-      }
-      @rpc_server.mount_proc('/api/processes.killWorkers') { |req, res|
-        $log.debug "fluentd RPC got /api/processes.killWorkers request"
-        supervisor_sigterm_handler
-        nil
-      }
-      @rpc_server.mount_proc('/api/plugins.flushBuffers') { |req, res|
-        $log.debug "fluentd RPC got /api/plugins.flushBuffers request"
-        supervisor_sigusr1_handler
-        nil
-      }
-      @rpc_server.mount_proc('/api/config.reload') { |req, res|
-        $log.debug "fluentd RPC got /api/config.reload request"
-        $log.info "restarting"
-        supervisor_sighup_handler
-        nil
-      }
-      @rpc_server.mount_proc('/api/config.dump') { |req, res|
-        $log.debug "fluentd RPC got /api/config.dump request"
-        $log.info "dump in-memory config"
-        supervisor_dump_config_handler
-        nil
-      }
-    end
-
-    def setup_rpc_get_dump
-      @rpc_server.mount_proc('/api/config.getDump') { |req, res|
-        $log.debug "fluentd RPC got /api/config.dump request"
-        $log.info "get dump in-memory config via HTTP"
-        res.body = supervisor_get_dump_config_handler
-        [nil, nil, res]
-      }
-    end
-
-    def run_rpc_server
-      @rpc_server.start
-    end
-
-    def stop_rpc_server
-      @rpc_server.shutdown
-    end
-
-    def supervise(&block)
-      start_time = Time.now
+    def install_main_process_signal_handlers
+      # Fluentd worker process (worker of ServerEngine) don't use code in serverengine to set signal handlers,
+      # because it does almost nothing.
+      # This method is the only method to set signal handlers in Fluentd worker process.
 
-      Process.setproctitle("supervisor:#{@process_name}") if @process_name
-      $log.info "starting fluentd-#{Fluent::VERSION}"
-      @main_pid = fork do
-        main_process(&block)
+      # When user use Ctrl + C not SIGINT, SIGINT is sent to all process in same process group.
+      # ServerEngine server process will send SIGTERM to child(spawned) processes by that SIGINT, so
+      # worker process SHOULD NOT do anything with SIGINT, SHOULD just ignore.
+      trap :INT do
+        $log.debug "fluentd main process get SIGINT"
       end
 
-      if @daemonize && @wait_daemonize_pipe_w
-        STDIN.reopen("/dev/null")
-        STDOUT.reopen("/dev/null", "w")
-        STDERR.reopen("/dev/null", "w")
-        @wait_daemonize_pipe_w.close
-        @wait_daemonize_pipe_w = nil
+      trap :TERM do
+        $log.debug "fluentd main process get SIGTERM"
+        unless @finished
+          @finished = true
+          $log.debug "getting start to shutdown main process"
+          Fluent::Engine.stop
+        end
       end
 
-      Process.waitpid(@main_pid)
-      @main_pid = nil
-      ecode = $?.to_i
+      trap :USR1 do
+        flush_buffer
+      end unless Fluent.windows?
+    end
 
-      $log.info "process finished", code: ecode
+    def flush_buffer
+      $log.debug "fluentd main process get SIGUSR1"
+      $log.info "force flushing buffered events"
+      @log.reopen!
 
-      if !@finished && Time.now - start_time < 1
-        $log.warn "process died within 1 second. exit."
-        exit ecode
-      end
+      # Creating new thread due to mutex can't lock
+      # in main thread during trap context
+      Thread.new {
+        begin
+          Fluent::Engine.flush!
+          $log.debug "flushing thread: flushed"
+        rescue Exception => e
+          $log.warn "flushing thread error: #{e}"
+        end
+      }.run
     end
 
     def main_process(&block)
@@ -364,12 +507,14 @@ module Fluent
 
       begin
         block.call
-
       rescue Fluent::ConfigError
         $log.error "config error", file: @config_path, error: $!.to_s
         $log.debug_backtrace
         unless @log.stdout?
-          console = Fluent::Log.new(STDOUT, @log_level).enable_debug
+          logger = ServerEngine::DaemonLogger.new(STDOUT)
+          log = Fluent::Log.new(logger)
+          log.level = @log_level
+          console = log.enable_debug
           console.error "config error", file: @config_path, error: $!.to_s
           console.debug_backtrace
         end
@@ -378,7 +523,10 @@ module Fluent
         $log.error "unexpected error", error: $!.to_s
         $log.error_backtrace
         unless @log.stdout?
-          console = Fluent::Log.new(STDOUT, @log_level).enable_debug
+          logger = ServerEngine::DaemonLogger.new(STDOUT)
+          log = Fluent::Log.new(logger)
+          log.level = @log_level
+          console = log.enable_debug
           console.error "unexpected error", error: $!.to_s
           console.error_backtrace
         end
@@ -387,86 +535,6 @@ module Fluent
       exit! 1
     end
 
-    def install_supervisor_signal_handlers
-      trap :INT do
-        $log.debug "fluentd supervisor process get SIGINT"
-        supervisor_sigint_handler
-      end
-
-      trap :TERM do
-        $log.debug "fluentd supervisor process get SIGTERM"
-        supervisor_sigterm_handler
-      end
-
-      trap :HUP do
-        $log.debug "fluentd supervisor process get SIGHUP"
-        $log.info "restarting"
-        supervisor_sighup_handler
-      end
-
-      trap :USR1 do
-        $log.debug "fluentd supervisor process get SIGUSR1"
-        supervisor_sigusr1_handler
-      end
-    end
-
-    def supervisor_sigint_handler
-      @finished = true
-      if pid = @main_pid
-        # kill processes only still exists
-        unless Process.waitpid(pid, Process::WNOHANG)
-          begin
-            Process.kill(:INT, pid)
-          rescue Errno::ESRCH
-            # ignore processes already died
-          end
-        end
-      end
-    end
-
-    def supervisor_sigterm_handler
-      @finished = true
-      if pid = @main_pid
-        # kill processes only still exists
-        unless Process.waitpid(pid, Process::WNOHANG)
-          begin
-            Process.kill(:TERM, pid)
-          rescue Errno::ESRCH
-            # ignore processes already died
-          end
-        end
-      end
-    end
-
-    def supervisor_sighup_handler
-      # Creating new thread due to mutex can't lock
-      # in main thread during trap context
-      Thread.new {
-        read_config
-        set_system_config
-        if pid = @main_pid
-          Process.kill(:TERM, pid)
-          # don't resuce Erro::ESRSH here (invalid status)
-        end
-      }.run
-    end
-
-    def supervisor_sigusr1_handler
-      @log.reopen!
-      if pid = @main_pid
-        Process.kill(:USR1, pid)
-        # don't resuce Erro::ESRSH here (invalid status)
-      end
-    end
-
-    def supervisor_dump_config_handler
-      $log.info @conf.to_s
-    end
-
-    def supervisor_get_dump_config_handler
-      {conf: @conf.to_s}
-    end
-
     def read_config
       $log.info "reading config file", path: @config_path
       @config_fname = File.basename(@config_path)
@@ -485,25 +553,8 @@ module Fluent
       @system_config.apply(self)
     end
 
-    def run_configure
-      Fluent::Engine.run_configure(@conf)
-    end
-
     def change_privilege
-      if @chgroup
-        etc_group = Supervisor.get_etc_group(@chgroup)
-        Process::GID.change_privilege(etc_group.gid)
-      end
-
-      if @chuser
-        etc_pw = Supervisor.get_etc_passwd(@chuser)
-        user_groups = [etc_pw.gid]
-        Etc.setgrent
-        Etc.group { |gr| user_groups << gr.gid if gr.mem.include?(etc_pw.name) } # emulate 'id -G'
-
-        Process.groups = Process.groups | user_groups
-        Process::UID.change_privilege(etc_pw.uid)
-      end
+      ServerEngine::Daemon.change_privilege(@chuser, @chgroup)
     end
 
     def init_engine
@@ -516,54 +567,13 @@ module Fluent
       @plugin_dirs.each {|dir|
         if Dir.exist?(dir)
           dir = File.expand_path(dir)
-          Fluent::Engine.load_plugin_dir(dir)
+          Fluent::Engine.add_plugin_dir(dir)
         end
       }
     end
 
-    def install_main_process_signal_handlers
-      # Strictly speaking, these signal handling is not thread safe.
-      # But enough safe to limit twice call of Fluent::Engine.stop.
-
-      trap :INT do
-        $log.debug "fluentd main process get SIGINT"
-        unless @finished
-          @finished = true
-          $log.debug "getting start to shutdown main process"
-          Fluent::Engine.stop
-        end
-      end
-
-      trap :TERM do
-        $log.debug "fluentd main process get SIGTERM"
-        unless @finished
-          @finished = true
-          $log.debug "getting start to shutdown main process"
-          Fluent::Engine.stop
-        end
-      end
-
-      trap :HUP do
-        # TODO
-        $log.debug "fluentd main process get SIGHUP"
-      end
-
-      trap :USR1 do
-        $log.debug "fluentd main process get SIGUSR1"
-        $log.info "force flushing buffered events"
-        @log.reopen!
-
-        # Creating new thread due to mutex can't lock
-        # in main thread during trap context
-        Thread.new {
-          begin
-            Fluent::Engine.flush!
-            $log.debug "flushing thread: flushed"
-          rescue Exception => e
-            $log.warn "flushing thread error: #{e}"
-          end
-        }.run
-      end
+    def run_configure
+      Fluent::Engine.run_configure(@conf)
     end
 
     def run_engine