Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

in_tail: Always read from head for new/rotated files after startup #3542

Merged
merged 6 commits into from
Nov 4, 2021
Merged

in_tail: Always read from head for new/rotated files after startup #3542

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2012df4
Always read from head for new/rotated files after startup
majimenez-stratio Nov 1, 2021
98feddc
Refactor startup to instance variable
majimenez-stratio Nov 1, 2021
978c6c1
Merge branch 'master' into read_from_head
majimenez-stratio Nov 2, 2021
c7911f9
test_in_tail: Add test_always_read_from_head_on_detecting_a_new_file
ashie Nov 2, 2021
d03b120
in_tail: Remove needless space
ashie Nov 2, 2021
114a060
in_tail: Simplify a ternary operator
ashie Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/fluent/plugin/in_tail.rb
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@ def initialize
@ignore_list = []
@shutdown_start_time = nil
@metrics = nil
@startup = true
end

desc 'The paths to read. Multiple paths can be specified, separated by comma.'
Expand Down Expand Up @@ -371,17 +372,19 @@ def refresh_watchers
existence_paths_hash = existence_path

log.debug { "tailing paths: target = #{target_paths.join(",")} | existing = #{existence_paths.join(",")}" }

majimenez-stratio marked this conversation as resolved.
Show resolved Hide resolved
unwatched_hash = existence_paths_hash.reject {|key, value| target_paths_hash.key?(key)}
added_hash = target_paths_hash.reject {|key, value| existence_paths_hash.key?(key)}

majimenez-stratio marked this conversation as resolved.
Show resolved Hide resolved
stop_watchers(unwatched_hash, immediate: false, unwatched: true) unless unwatched_hash.empty?
start_watchers(added_hash) unless added_hash.empty?
@startup = false if @startup
end

def setup_watcher(target_info, pe)
line_buffer_timer_flusher = @multiline_mode ? TailWatcher::LineBufferTimerFlusher.new(log, @multiline_flush_interval, &method(:flush_buffer)) : nil
tw = TailWatcher.new(target_info, pe, log, @read_from_head, @follow_inodes, method(:update_watcher), line_buffer_timer_flusher, method(:io_handler), @metrics)
read_from_head = @startup ? @read_from_head : true
tw = TailWatcher.new(target_info, pe, log, read_from_head, @follow_inodes, method(:update_watcher), line_buffer_timer_flusher, method(:io_handler), @metrics)

if @enable_watch_timer
tt = TimerTrigger.new(1, log) { tw.on_notify }
Expand Down