merge detach and detach2

it's okay that the order of TailWatcher#close and @line_buffer_timer_flusher&.close changes. io_handler is already closed, so no more data come in. Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
fluent · Mar 2, 2020 · edffed4 · edffed4
1 parent 1c91af2
commit edffed4
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/lib/fluent/plugin/in_tail.rb b/lib/fluent/plugin/in_tail.rb
@@ -422,8 +422,6 @@ def detach_watcher(tw, close_io = true)
 
       tw.close if close_io
 
-      tw.detach2
-
       if tw.unwatched && @pf
         @pf.unwatch(tw.path)
       end
@@ -610,9 +608,6 @@ def register_watcher(watcher)
 
       def detach
         @io_handler.on_notify if @io_handler
-      end
-
-      def detach2
         @line_buffer_timer_flusher&.close(self)
       end