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

in_tail: Fix StatWatcher uses wrong path #3541

Merged
merged 7 commits into from
Nov 2, 2021
Merged

in_tail: Fix StatWatcher uses wrong path #3541

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6978442
Fix stat_watcher wrong path
majimenez-stratio Oct 31, 2021
1dae546
test_in_tail: Fix an inappropriate config name
ashie Nov 1, 2021
494055e
test_in_tail: Add test_watch_wildcard_path_without_watch_timer
ashie Nov 1, 2021
e908a5d
Fix log when follow_inodes = true
majimenez-stratio Nov 1, 2021
8c03b71
test: Run test_watch_wildcard_path_without_watch_timer only on Linux
ashie Nov 1, 2021
200bd27
in_tail: Avoid to build debug string when debug mode isn't activated
ashie Nov 2, 2021
ebfd278
test_in_tail: Add timeout for test_watch_wildcard_path_without_watch_…
ashie Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/fluent/plugin/in_tail.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ def refresh_watchers
target_paths_hash = expand_paths
existence_paths_hash = existence_path

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

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)}
Expand All @@ -389,7 +389,7 @@ def setup_watcher(target_info, pe)
end

if @enable_stat_watcher
tt = StatWatcher.new(path, log) { tw.on_notify }
tt = StatWatcher.new(target_info.path, log) { tw.on_notify }
tw.register_watcher(tt)
end

Expand Down