fluentd 0.14.11-x64-mingw32 → 0.14.12-x64-mingw32

data/test/test_supervisor.rb

@@ -9,10 +9,13 @@ require 'uri'
 require 'fileutils'
 
 class SupervisorTest < ::Test::Unit::TestCase
-  include Fluent
-  include FluentTest
-  include ServerModule
-  include WorkerModule
+  class DummyServer
+    include Fluent::ServerModule
+    attr_accessor :rpc_endpoint, :enable_get_dump
+    def config
+      {}
+    end
+  end
 
   TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/tmp/supervisor#{ENV['TEST_ENV_NUMBER']}")
   TMP_ROOT_DIR = File.join(TMP_DIR, 'root')
@@ -105,80 +108,83 @@ class SupervisorTest < ::Test::Unit::TestCase
   end
 
   def test_main_process_signal_handlers
-    create_info_dummy_logger
-
-    unless Fluent.windows?
-      opts = Fluent::Supervisor.default_options
-      sv = Fluent::Supervisor.new(opts)
-      sv.send(:install_main_process_signal_handlers)
+    omit "Windows cannot handle signals" if Fluent.windows?
 
-      begin
-        Process.kill :USR1, $$
-      rescue
-      end
+    create_info_dummy_logger
 
-      sleep 1
+    opts = Fluent::Supervisor.default_options
+    sv = Fluent::Supervisor.new(opts)
+    sv.send(:install_main_process_signal_handlers)
 
-      info_msg = '[info]: force flushing buffered events' + "\n"
-      assert{ $log.out.logs.first.end_with?(info_msg) }
+    begin
+      Process.kill :USR1, $$
+    rescue
     end
 
-    $log.out.reset
+    sleep 1
+
+    info_msg = '[info]: force flushing buffered events' + "\n"
+    assert{ $log.out.logs.first.end_with?(info_msg) }
+  ensure
+    $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
   end
 
   def test_supervisor_signal_handler
-    create_debug_dummy_logger
-
-    unless Fluent.windows?
+    omit "Windows cannot handle signals" if Fluent.windows?
 
-      install_supervisor_signal_handlers
-      begin
-        Process.kill :USR1, $$
-      rescue
-      end
-
-      sleep 1
+    create_debug_dummy_logger
 
-      debug_msg = '[debug]: fluentd supervisor process get SIGUSR1' + "\n"
-      assert{ $log.out.logs.first.end_with?(debug_msg) }
+    server = DummyServer.new
+    server.install_supervisor_signal_handlers
+    begin
+      Process.kill :USR1, $$
+    rescue
     end
 
-    $log.out.reset
+    sleep 1
+
+    debug_msg = '[debug]: fluentd supervisor process get SIGUSR1'
+    logs = $log.out.logs
+    assert{ logs.any?{|log| log.include?(debug_msg) } }
+  ensure
+    $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
   end
 
   def test_rpc_server
+    omit "Windows cannot handle signals" if Fluent.windows?
+
     create_info_dummy_logger
 
-    unless Fluent.windows?
-      opts = Fluent::Supervisor.default_options
-      sv = Fluent::Supervisor.new(opts)
-      conf_data = <<-EOC
+    opts = Fluent::Supervisor.default_options
+    sv = Fluent::Supervisor.new(opts)
+    conf_data = <<-EOC
   <system>
     rpc_endpoint 0.0.0.0:24447
   </system>
-      EOC
-      conf = Fluent::Config.parse(conf_data, "(test)", "(test_dir)", true)
-      sv.instance_variable_set(:@conf, conf)
-      sv.send(:set_system_config)
-      sys_conf = sv.instance_variable_get(:@system_config)
-      @rpc_endpoint = sys_conf.rpc_endpoint
-      @enable_get_dump = sys_conf.enable_get_dump
+    EOC
+    conf = Fluent::Config.parse(conf_data, "(test)", "(test_dir)", true)
+    sv.instance_variable_set(:@conf, conf)
+    sv.send(:set_system_config)
+    sys_conf = sv.instance_variable_get(:@system_config)
 
-      run_rpc_server
+    server = DummyServer.new
+    server.rpc_endpoint = sys_conf.rpc_endpoint
+    server.enable_get_dump = sys_conf.enable_get_dump
 
-      sv.send(:install_main_process_signal_handlers)
-      Net::HTTP.get URI.parse('http://0.0.0.0:24447/api/plugins.flushBuffers')
-      info_msg = '[info]: force flushing buffered events' + "\n"
+    server.run_rpc_server
 
-      stop_rpc_server
+    sv.send(:install_main_process_signal_handlers)
+    Net::HTTP.get URI.parse('http://0.0.0.0:24447/api/plugins.flushBuffers')
+    info_msg = '[info]: force flushing buffered events' + "\n"
 
-      # In TravisCI with OSX(Xcode), it seems that can't use rpc server.
-      # This test will be passed in such environment.
-      pend unless $log.out.logs.first
+    server.stop_rpc_server
 
-      assert{ $log.out.logs.first.end_with?(info_msg) }
-    end
+    # In TravisCI with OSX(Xcode), it seems that can't use rpc server.
+    # This test will be passed in such environment.
+    pend unless $log.out.logs.first
 
+    assert{ $log.out.logs.first.end_with?(info_msg) }
+  ensure
     $log.out.reset
   end
 
@@ -197,6 +203,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     write_config tmp_dir, conf_info_str
 
     params = {}
+    params['workers'] = 1
     params['use_v1_config'] = true
     params['log_path'] = 'test/tmp/supervisor/log'
     params['suppress_repeated_stacktrace'] = true
@@ -243,7 +250,7 @@ class SupervisorTest < ::Test::Unit::TestCase
 
     # fifth call after changed conf file(don't reuse config)
     se_config = load_config_proc.call
-    assert_equal Fluent::Log::LEVEL_DEBUG, se_config[:log_level]
+    assert_equal Fluent::Log::LEVEL_INFO, se_config[:log_level]
   end
 
   def test_load_config_for_daemonize
@@ -261,12 +268,13 @@ class SupervisorTest < ::Test::Unit::TestCase
     write_config tmp_dir, conf_info_str
 
     params = {}
+    params['workers'] = 1
     params['use_v1_config'] = true
     params['log_path'] = 'test/tmp/supervisor/log'
     params['suppress_repeated_stacktrace'] = true
     params['log_level'] = Fluent::Log::LEVEL_INFO
     params['daemonize'] = './fluentd.pid'
-    load_config_proc =  Proc.new { Fluent::Supervisor.load_config(tmp_dir, params) }
+    load_config_proc = Proc.new { Fluent::Supervisor.load_config(tmp_dir, params) }
 
     # first call
     se_config = load_config_proc.call
@@ -308,14 +316,14 @@ class SupervisorTest < ::Test::Unit::TestCase
 
     # fifth call after changed conf file(don't reuse config)
     se_config = load_config_proc.call
-    assert_equal Fluent::Log::LEVEL_DEBUG, se_config[:log_level]
+    assert_equal Fluent::Log::LEVEL_INFO, se_config[:log_level]
   end
 
   def test_logger
     opts = Fluent::Supervisor.default_options
     sv = Fluent::Supervisor.new(opts)
     log = sv.instance_variable_get(:@log)
-    log.init
+    log.init(:standalone, 0)
     logger = $log.instance_variable_get(:@logger)
 
     assert_equal Fluent::Log::LEVEL_INFO, $log.level
@@ -340,7 +348,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     )
     sv = Fluent::Supervisor.new(opts)
     log = sv.instance_variable_get(:@log)
-    log.init
+    log.init(:standalone, 0)
 
     assert_equal Fluent::LogDeviceIO, $log.out.class
     assert_equal rotate_age, $log.out.instance_variable_get(:@shift_age)

data/test/test_test_drivers.rb

@@ -67,7 +67,7 @@ class TestDriverTest < ::Test::Unit::TestCase
         assert_nothing_raised do
           before = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           d.end_if{ false }
-          d.run(timeout: 1) do
+          d.run(timeout: 5) do
             sleep 0.1 until d.stop?
           end
           after = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -89,7 +89,7 @@ class TestDriverTest < ::Test::Unit::TestCase
           end
         end
       end
-      assert_raise "yaaaaaaaaaay!" do
+      assert_raise RuntimeError.new("yaaaaaaaaaay!") do
         d.end_if{ false }
         d.run(timeout: 3) do
           sleep 0.1 until d.stop?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.11
+  version: 0.14.12
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -369,17 +369,21 @@ files:
 - code-of-conduct.md
 - example/copy_roundrobin.conf
 - example/filter_stdout.conf
+- example/in_dummy_blocks.conf
 - example/in_dummy_with_compression.conf
 - example/in_forward.conf
 - example/in_forward_client.conf
 - example/in_forward_shared_key.conf
+- example/in_forward_tls.conf
 - example/in_forward_users.conf
+- example/in_forward_workers.conf
 - example/in_http.conf
 - example/in_out_forward.conf
 - example/in_syslog.conf
 - example/in_tail.conf
 - example/in_tcp.conf
 - example/in_udp.conf
+- example/logevents.conf
 - example/multi_filters.conf
 - example/out_copy.conf
 - example/out_exec_filter.conf
@@ -387,15 +391,19 @@ files:
 - example/out_forward.conf
 - example/out_forward_buf_file.conf
 - example/out_forward_client.conf
+- example/out_forward_heartbeat_none.conf
 - example/out_forward_shared_key.conf
+- example/out_forward_tls.conf
 - example/out_forward_users.conf
 - example/out_null.conf
 - example/secondary_file.conf
+- example/suppress_config_dump.conf
 - example/v0_12_filter.conf
 - example/v1_literal_example.conf
 - fluent.conf
 - fluentd.gemspec
 - lib/fluent/agent.rb
+- lib/fluent/clock.rb
 - lib/fluent/command/binlog_reader.rb
 - lib/fluent/command/bundler_injection.rb
 - lib/fluent/command/cat.rb
@@ -527,6 +535,7 @@ files:
 - lib/fluent/plugin/storage_local.rb
 - lib/fluent/plugin/string_util.rb
 - lib/fluent/plugin_helper.rb
+- lib/fluent/plugin_helper/cert_option.rb
 - lib/fluent/plugin_helper/child_process.rb
 - lib/fluent/plugin_helper/compat_parameters.rb
 - lib/fluent/plugin_helper/event_emitter.rb
@@ -543,7 +552,6 @@ files:
 - lib/fluent/plugin_helper/thread.rb
 - lib/fluent/plugin_helper/timer.rb
 - lib/fluent/plugin_id.rb
-- lib/fluent/process.rb
 - lib/fluent/registry.rb
 - lib/fluent/root_agent.rb
 - lib/fluent/rpc.rb
@@ -612,6 +620,7 @@ files:
 - test/plugin/test_filter_record_transformer.rb
 - test/plugin/test_filter_stdout.rb
 - test/plugin/test_formatter_csv.rb
+- test/plugin/test_formatter_hash.rb
 - test/plugin/test_formatter_json.rb
 - test/plugin/test_formatter_ltsv.rb
 - test/plugin/test_formatter_msgpack.rb
@@ -687,6 +696,7 @@ files:
 - test/scripts/fluent/plugin/out_test.rb
 - test/scripts/fluent/plugin/out_test2.rb
 - test/scripts/fluent/plugin/parser_known.rb
+- test/test_clock.rb
 - test/test_config.rb
 - test/test_configdsl.rb
 - test/test_event.rb
@@ -699,10 +709,10 @@ files:
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_output.rb
+- test/test_plugin.rb
 - test/test_plugin_classes.rb
 - test/test_plugin_helper.rb
 - test/test_plugin_id.rb
-- test/test_process.rb
 - test/test_root_agent.rb
 - test/test_supervisor.rb
 - test/test_test_drivers.rb
@@ -729,7 +739,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector
@@ -771,6 +781,7 @@ test_files:
 - test/plugin/test_filter_record_transformer.rb
 - test/plugin/test_filter_stdout.rb
 - test/plugin/test_formatter_csv.rb
+- test/plugin/test_formatter_hash.rb
 - test/plugin/test_formatter_json.rb
 - test/plugin/test_formatter_ltsv.rb
 - test/plugin/test_formatter_msgpack.rb
@@ -846,6 +857,7 @@ test_files:
 - test/scripts/fluent/plugin/out_test.rb
 - test/scripts/fluent/plugin/out_test2.rb
 - test/scripts/fluent/plugin/parser_known.rb
+- test/test_clock.rb
 - test/test_config.rb
 - test/test_configdsl.rb
 - test/test_event.rb
@@ -858,14 +870,13 @@ test_files:
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_output.rb
+- test/test_plugin.rb
 - test/test_plugin_classes.rb
 - test/test_plugin_helper.rb
 - test/test_plugin_id.rb
-- test/test_process.rb
 - test/test_root_agent.rb
 - test/test_supervisor.rb
 - test/test_test_drivers.rb
 - test/test_time_formatter.rb
 - test/test_time_parser.rb
 - test/test_unique_id.rb
-has_rdoc: false

data/lib/fluent/process.rb

@@ -1,504 +0,0 @@
-#
-# Fluentd
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-#
-
-# This feature will be deprecated after introducing
-#  symmetric multi processing in core.
-
-require 'thread'
-
-require 'fluent/config'
-## This comment out (to remove circular reference) is a bit risky,
-## but in all known cases this file is required after 'fluent/engine'.
-# require 'fluent/engine'
-require 'fluent/event'
-
-module Fluent
-  class DetachProcessManager
-    require 'singleton'
-    include Singleton
-
-    class Broker
-      def initialize
-      end
-
-      def engine
-        Engine
-      end
-    end
-
-    def initialize
-      require 'drb'
-      DRb.start_service(create_drb_uri, Broker.new)
-      @parent_uri = DRb.uri
-    end
-
-    def fork(delegate_object)
-      ipr, ipw = IO.pipe  # child Engine.emit_stream -> parent Engine.emit_stream
-      opr, opw = IO.pipe  # parent target.emit_events -> child target.emit_events
-
-      pid = Process.fork
-      if pid
-        # parent process
-        ipw.close
-        opr.close
-        forward_thread = process_parent(ipr, opw, pid, delegate_object)
-        return pid, forward_thread
-      end
-
-      # child process
-      ipr.close
-      opw.close
-      forward_thread = process_child(ipw, opr, delegate_object)
-      return nil, forward_thread
-    end
-
-    private
-    def read_header(ipr)
-      sz = ipr.read(4).unpack('N')[0]
-      ipr.read(sz)
-    end
-
-    def send_header(ipw, data)
-      ipw.write [data.bytesize].pack('N')
-      ipw.write data
-      ipw.flush
-    end
-
-    def create_drb_uri
-      "drbunix:"  # TODO
-    end
-
-    private
-    def process_child(ipw, opr, delegate_object)
-      DRb.start_service(create_drb_uri, delegate_object)
-      child_uri = DRb.uri
-
-      send_header(ipw, child_uri)
-
-      # override target.emit_stream to write event stream to the pipe
-      fwd = new_forwarder(ipw, 0.5)  # TODO interval
-      Engine.define_singleton_method(:emit_stream) do |tag,es|
-        fwd.emit(tag, es)
-      end
-
-      # read event stream from the pipe and forward to target.emit
-      forward_thread = Thread.new(opr, delegate_object, &method(:output_forward_main))
-
-      # override global methods to call parent process
-      override_shared_methods(@parent_uri)
-
-      return forward_thread
-    end
-
-    def override_shared_methods(parent_uri)
-      broker = DRbObject.new_with_uri(parent_uri)
-      shared_methods.each {|(broker_accessor,target,name)|
-        remote = broker.send(broker_accessor)
-        target.define_singleton_method(name) do |*args,&block|
-          remote.send(name, *args, &block)
-        end
-      }
-    end
-
-    def shared_methods
-      [
-        #[:engine, Engine, :flush!],
-        #[:engine, Engine, :stop],
-      ]
-    end
-
-    def process_parent(ipr, opw, pid, delegate_object)
-      # child_uri = read_header(ipr)
-
-      # read event stream from the pipe and forward to Engine.emit_stream
-      forward_thread = Thread.new(ipr, pid, &method(:input_forward_main))
-
-      # note: don't override methods in parent process
-      #       because another process may fork after overriding
-      #override_delegate_methods(delegate_object, child_uri)
-
-      # return forwarder for DetachProcessMixin to
-      # override target.emit and write event stream to the pipe
-      fwd = new_forwarder(opw, 0.5)  # TODO interval
-      # note: override emit method on DetachProcessMixin
-      forward_thread.define_singleton_method(:forwarder) do
-        fwd
-      end
-
-      return forward_thread
-    end
-
-    #def override_delegate_methods(target, child_uri)
-    #  remote = DRbObject.new_with_uri(child_uri)
-    #  delegate_methods(target).each {|name|
-    #    target.define_singleton_method(name) do |*args,&block|
-    #      remote.send(name, *args, &block)
-    #    end
-    #  }
-    #end
-    #
-    #def delegate_methods(target)
-    #  target.methods - Object.public_instance_methods
-    #end
-
-    def output_forward_main(opr, target)
-      read_event_stream(opr) {|tag,es|
-        # FIXME error handling
-        begin
-          target.emit_events(tag, es)
-        rescue
-          $log.warn "failed to emit", error: $!.to_s, pid: Process.pid
-          $log.warn_backtrace
-        end
-      }
-    rescue
-      $log.error "error on output process forwarding thread", error: $!.to_s, pid: Process.pid
-      $log.error_backtrace
-      raise
-    end
-
-    def input_forward_main(ipr, pid)
-      read_event_stream(ipr) {|tag,es|
-        # FIXME error handling
-        begin
-          Engine.emit_stream(tag, es)
-        rescue
-          $log.warn "failed to emit", error: $!.to_s, pid: Process.pid
-          $log.warn_backtrace
-        end
-      }
-    rescue
-      $log.error "error on input process forwarding thread", error: $!.to_s, pid: Process.pid
-      $log.error_backtrace
-      raise
-    end
-
-    def read_event_stream(r, &block)
-      u = Fluent::Engine.msgpack_factory.unpacker(r)
-      begin
-        #buf = ''
-        #map = {}
-        #while true
-        #  r.readpartial(64*1024, buf)
-        #  u.feed_each(buf) {|tag,ms|
-        #    if msbuf = map[tag]
-        #      msbuf << ms
-        #    else
-        #      map[tag] = ms
-        #    end
-        #  }
-        #  unless map.empty?
-        #    map.each_pair {|tag,ms|
-        #      es = MessagePackEventStream.new(ms)
-        #      block.call(tag, es)
-        #    }
-        #    map.clear
-        #  end
-        #end
-        u.each {|tag,ms|
-          es = MessagePackEventStream.new(ms)
-          block.call(tag, es)
-        }
-      rescue EOFError
-      ensure
-        r.close
-      end
-    end
-
-    def new_forwarder(w, interval)
-      if interval < 0.2  # TODO interval
-        Forwarder.new(w)
-      else
-        DelayedForwarder.new(w, interval)
-      end
-    end
-
-    class Forwarder
-      def initialize(w)
-        @w = w
-      end
-
-      def emit(tag, es)
-        ms = es.to_msgpack_stream
-        #[tag, ms].to_msgpack(@w)  # not thread safe
-        @w.write [tag, ms].to_msgpack
-      end
-    end
-
-    class DelayedForwarder
-      def initialize(w, interval)
-        @w = w
-        @interval = interval
-        @buffer = {}
-        @mutex = Mutex.new
-        Thread.new(&method(:run))
-      end
-
-      def emit(tag, es)
-        stream = es.to_msgpack_stream
-        @mutex.synchronize do
-          if @buffer[tag]
-            @buffer[tag] << stream
-          else
-            @buffer[tag] = stream
-          end
-        end
-      end
-
-      def run
-        while true
-          sleep @interval
-
-          pairs = []
-          @mutex.synchronize do
-            @buffer.keys.each do |tag|
-              if ms = @buffer.delete(tag)
-                pairs << [tag, ms]
-              end
-            end
-          end
-          pairs.each do |pair|
-            pair.to_msgpack(@w)
-          end
-        end
-      rescue
-        $log.error "error on forwerder thread", error: $!.to_s
-        $log.error_backtrace
-        raise
-      end
-    end
-
-    class MultiForwarder
-      def initialize(forwarders)
-        @forwarders = forwarders
-        @rr = 1
-      end
-
-      def emit(tag, es)
-        forwarder = @forwarders[@rr]
-        @rr = (@rr + 1) % @forwarders.length
-        forwarder.emit(tag, es)
-      end
-    end
-  end
-
-
-  module DetachProcessImpl
-    def on_detach_process(i)
-    end
-
-    def on_exit_process(i)
-    end
-
-    private
-
-    def detach_process_impl(num, &block)
-      children = []
-
-      num.times do |i|
-        pid, forward_thread = DetachProcessManager.instance.fork(self)
-
-        if pid
-          # parent process
-          $log.info "detached process", class: self.class, pid: pid
-          children << [pid, forward_thread]
-          next
-        end
-
-        # child process
-        begin
-          on_detach_process(i)
-
-          block.call
-
-          # disable Engine.stop called by signal handler
-          Engine.define_singleton_method(:stop) do
-            # do nothing
-          end
-
-          # override signal handlers called by parent process
-          fin = FinishWait.new
-          trap :INT do
-            fin.stop
-          end
-          trap :TERM do
-            fin.stop
-          end
-          #forward_thread.join  # TODO this thread won't stop because parent doesn't close pipe
-          fin.wait
-
-          on_exit_process(i)
-          exit! 0
-        ensure
-          $log.error "unknown error while shutting down this child process", error: $!.to_s, pid: Process.pid
-          $log.error_backtrace
-        end
-
-        exit! 1
-      end
-
-      # parent process
-      # override shutdown method to kill child processes
-      define_singleton_method(:shutdown) do
-        children.each {|pair|
-          begin
-            pid = pair[0]
-            forward_thread = pair[1]
-            if pid
-              Process.kill(:TERM, pid)
-              forward_thread.join   # wait until child closes pipe
-              Process.waitpid(pid)
-              pair[0] = nil
-            end
-          rescue
-            $log.error "unknown error while shutting down remote child process", error: $!.to_s
-            $log.error_backtrace
-          end
-        }
-      end
-
-      # override target.emit_events and write event stream to the pipe
-      forwarders = children.map {|pair| pair[1].forwarder }
-      if forwarders.length > 1
-        # use roundrobin
-        fwd = DetachProcessManager::MultiForwarder.new(forwarders)
-      else
-        fwd = forwarders[0]
-      end
-      define_singleton_method(:emit_events) do |tag,es|
-        fwd.emit_events(tag, es)
-      end
-    end
-
-    class FinishWait
-      def initialize
-        @finished = false
-        @mutex = Mutex.new
-        @cond = ConditionVariable.new
-      end
-
-      def wait
-        @mutex.synchronize do
-          until @finished
-            @cond.wait(@mutex, 1.0)
-          end
-        end
-      end
-
-      def stop
-        return if @finished
-        @finished = true
-        # Creating new thread due to mutex can't lock in main thread during trap context
-        Thread.new {
-          @mutex.synchronize do
-            @cond.broadcast
-          end
-        }.run
-      end
-
-      def finished?
-        @finished
-      end
-    end
-  end
-
-
-  module DetachProcessMixin
-    include DetachProcessImpl
-
-    def configure(conf)
-      super
-
-      @detach_process = nil
-
-      if detach_process = conf['detach_process']
-        b3v = Config.bool_value(detach_process)
-        case b3v
-        when nil
-          num = detach_process.to_i
-          if num > 1
-            $log.warn "'detach_process' parameter supports only 1 process on this plugin: #{conf}"
-          elsif num > 0
-            @detach_process = true
-          elsif detach_process =~ /0+/
-            @detach_process = false
-          else
-            @detach_process = true
-          end
-        when true
-          @detach_process = true
-        when false
-          @detach_process = false
-        end
-      end
-    end
-
-    def detach_process(&block)
-      if @detach_process
-        detach_process_impl(1, &block)
-      else
-        block.call
-      end
-    end
-  end
-
-
-  module DetachMultiProcessMixin
-    include DetachProcessImpl
-
-    def initialize
-      @detach_process_num = 2
-      super
-    end
-
-    def configure(conf)
-      super
-
-      @detach_process = nil
-
-      if detach_process = conf['detach_process']
-        b3v = Config.bool_value(detach_process)
-        case b3v
-        when nil
-          num = detach_process.to_i
-          if num > 0
-            @detach_process = true
-            @detach_process_num = num
-          elsif detach_process =~ /0+/
-            @detach_process = false
-          else
-            @detach_process = true
-          end
-        when true
-          @detach_process = true
-        when false
-          @detach_process = false
-        end
-      end
-    end
-
-    private
-
-    def detach_multi_process(&block)
-      if @detach_process
-        detach_process_impl(@detach_process_num, &block)
-      else
-        block.call
-      end
-    end
-  end
-end
-