Divide the search method.

fluent-plugin-droonga.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency "fluentd"
-  gem.add_dependency "rroonga"
+  gem.add_dependency "rroonga", ">= 3.0.3"
   gem.add_dependency "fluent-logger"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "bundler"

lib/droonga/worker.rb

@@ -42,10 +42,7 @@ def initialize(options={})
     end
 
     def shutdown
-      @pool.each do |pid|
-        # TODO: do it gracefully
-        Process.kill(:KILL, pid)
-      end
+      shutdown_workers
       @handlers.each do |handler|
         handler.shutdown
       end
@@ -76,6 +73,24 @@ def post(body, destination=nil)
     end
 
     private
+    def shutdown_workers
+      @pool.each do |pid|
+        Process.kill(:TERM, pid)
+      end
+      queue = @context[@queue_name]
+      3.times do |i|
+        break if @pool.empty?
+        queue.unblock
+        @pool.reject! do |pid|
+          not Process.waitpid(pid, Process::WNOHANG).nil?
+        end
+        sleep(i ** 2 * 0.1)
+      end
+      @pool.each do |pid|
+        Process.kill(:KILL, pid)
+      end
+    end
+
     def post_or_push(message, body, destination)
       route = nil
       unless destination