fixed SIGUSR1 handler to force flush logs

hito-asa · Feb 15, 2012 · 2ca54e3 · 2ca54e3
1 parent e1b7cf8
commit 2ca54e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -4,7 +4,6 @@ Release 0.10.12 - 2012/02/13
 * Engine shows warnings when emitted record doesn't match any outputs
 * in_tail is rewritten to follow symbolic links correctly
 * out_forward uses independent default value as 'hard_timeout' parameter
-* 
 
 
 Release 0.10.11 - 2012/02/10

diff --git a/lib/fluent/engine.rb b/lib/fluent/engine.rb
@@ -191,7 +191,7 @@ def flush_recursive(array)
           m = m.output
         end
         if m.is_a?(BufferedOutput)
-          m.try_flush
+          m.force_flush
         elsif m.is_a?(MultiOutput)
           flush_recursive(m.outputs)
         end

diff --git a/lib/fluent/output.rb b/lib/fluent/output.rb
@@ -361,6 +361,11 @@ def try_flush
     end
   end
 
+  def force_flush
+    enqueue_buffer
+    submit_flush
+  end
+
   def before_shutdown
     begin
       @buffer.before_shutdown(self)