Skip to content

Add follow_only_path flag to dumb down filewatching to just paths #34

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add follow_only_path flag to dumb down filewatching to just paths #34

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a376432
Add follow_only_path flag to dumb down filewatching to just paths
May 30, 2014
5e551a6
Need to maintain string/int distinction for 'inode' index
Jun 13, 2014
aa5255e
Revert "Need to maintain string/int distinction for 'inode' index"
Jun 13, 2014
0e3e6c2
Handle cases of file paths containing spaces and/or carriage returns
michio-nikaido Jun 25, 2014
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
29 changes: 23 additions & 6 deletions lib/filewatch/tail.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ def initialize(opts={})
:stat_interval => 1,
:discover_interval => 5,
:exclude => [],
:start_new_files_at => :end
:start_new_files_at => :end,
:follow_only_path => false
}.merge(opts)
if [email protected]?(:sincedb_path)
@opts[:sincedb_path] = File.join(ENV["HOME"], ".sincedb") if ENV.include?("HOME")
Expand Down Expand Up @@ -128,13 +129,29 @@ def _open_file(path, event)

stat = File::Stat.new(path)

if @iswindows
fileId = Winhelper.GetWindowsUniqueFileIdentifier(path)
inode = [fileId, stat.dev_major, stat.dev_minor]
if @opts[:follow_only_path]
# In cases where files are rsynced to the consuming server, inodes will change when
# updated files overwrite original ones, resulting in inode changes. In order to
# avoid having the sincedb.member check from failing in this scenario, we'll
# construct the inode key using the path which will be 'stable'
#
# Because spaces and carriage returns are valid characters in linux paths, we have
# to take precautions to avoid having them show up in the .sincedb where they would
# derail any parsing that occurs in _sincedb_open. Since NULL (\0) is NOT a
# valid path character in LINUX (one of the few), we'll replace these troublesome
# characters with 'encodings' that won't be encountered in a normal path but will
# be handled properly by __sincedb_open
inode = [path.gsub(/ /, "\0\0").gsub(/\n/, "\0\1"), stat.dev_major, stat.dev_minor]
else
inode = [stat.ino.to_s, stat.dev_major, stat.dev_minor]
if @iswindows
fileId = Winhelper.GetWindowsUniqueFileIdentifier(path)
inode = [fileId, stat.dev_major, stat.dev_minor]
else
inode = [stat.ino.to_s, stat.dev_major, stat.dev_minor]
end

end


@statcache[path] = inode

if @sincedb.member?(inode)
Expand Down