fixing high cpu usage for polling

gina-alaska · May 10, 2012 · 41d38e8 · 41d38e8
1 parent 7840abc
commit 41d38e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/conveyor/foreman.rb b/lib/conveyor/foreman.rb
@@ -56,7 +56,15 @@ def watch(*args, &block)
       raise "Directory #{dir} not found" unless File.directory? dir
 
       listener = Listen.to(dir)
-      listener.latency(0.5)
+
+      if opts[:latency]
+      	listener.latency(opts[:latency])
+      elsif opts[:force_polling]
+	listener.latency(5)
+      else
+	listener.latency(0.5)
+      end
+
       listener.ignore(opts[:ignore]) if opts[:ignore]
       listener.force_polling(opts[:force_polling]) if opts[:force_polling]
 

diff --git a/lib/conveyor/worker.rb b/lib/conveyor/worker.rb
@@ -35,8 +35,9 @@ def watch(*args, &block)
     end
 
     def match(glob, &block)
+      debug "#{@filename} matches? #{glob}"
       # puts File.fnmatch(glob, @filename)
-      if File.fnmatch(glob, @filename)
+      if File.fnmatch(glob, @filename, File::FNM_PATHNAME | File::FNM_DOTMATCH)
         yield @filename
       end
     end