Skip to content

Commit

Permalink
merge detach and detach2
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ganmacs committed Feb 26, 2020
1 parent 34c8e3a commit bb55289
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions lib/fluent/plugin/in_tail.rb
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,6 @@ def detach_watcher(tw, close_io = true)

tw.close if close_io

tw.detach2

if tw.unwatched && @pf
@pf.unwatch(tw.path)
end
Expand Down Expand Up @@ -623,9 +621,6 @@ def register_watcher(watcher)

def detach
@io_handler.on_notify if @io_handler
end

def detach2
@line_buffer_timer_flusher&.close
end

Expand Down

0 comments on commit bb55289

Please sign in to comment.