shutdown won't block

netconstructor · Jul 1, 2012 · 73a317f · 73a317f
1 parent 975bf81
commit 73a317f
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/lib/fluent/engine.rb b/lib/fluent/engine.rb
@@ -174,13 +174,17 @@ def start
   end
 
   def shutdown
-    @started.reverse_each {|s|
-      begin
-        s.shutdown
-      rescue
-        $log.warn "unexpected error while shutting down", :error=>$!.to_s
-        $log.warn_backtrace
+    @started.map {|s|
+      Thread.new do
+        begin
+          s.shutdown
+        rescue
+          $log.warn "unexpected error while shutting down", :error=>$!.to_s
+          $log.warn_backtrace
+        end
       end
+    }.each {|t|
+      t.join
     }
   end