filewatch-ext 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd745a247b7c5a4cad92d151ecce249b84b77955
-  data.tar.gz: 807d72739b47249f1e45fafe9e03530c70b6c458
+  metadata.gz: f4686023797b04eae09ab5bec38217d1165d3b25
+  data.tar.gz: 4a09a85762f5d60cf45997e4ee67bfb0c36299fb
 SHA512:
-  metadata.gz: 557568e1c3143bd6c6c5b80779efbafb87aa6fa2b4756fd06d26106060734d31b98a79e4342af9995038c1c521d97ba5bffe7e7baff9325b53b93f29bf6e2376
-  data.tar.gz: 9d4a2baf2aa5dc41e514ed5f790ab2b2ee585721bb96effb7aa06080fd5e24f4ccfa72eaf9ce817f0c6801243d6d4a8d08ee69077fb84a31ee86ec8f29f69d14
+  metadata.gz: f94fb66a38aaf7362462b540117c5e782d306db617b35475983064766dfc855c3036aaecaa49ef922b4dfc08e486b3902e9d912d5641f43604d36868247dda83
+  data.tar.gz: 4b72a4ae0e6bc4a573749206a977b53faa36cdee65668995a468695fbe1b10b0159bed321379c14117b416bc6c0587d291c3433bcd9dc67404e26339f9966f44

data/lib/filewatch/ext/filetail.rb

@@ -111,16 +111,18 @@ module FileWatch::Ext
     private
     def _read_file(path, &block)
       # BufferedTokenizer is now in codec
+
+      changed = false
       loop do
         begin
           data = @files[path].sysread(32768)
-
+          changed = true
           yield(path, data, :log)
 
           @sincedb[@statcache[path]][:pos] = @files[path].pos
           _check_sincedb(false, path, &block)
         rescue EOFError
-          _check_sincedb(true, path, &block)
+          _check_sincedb(true, path, &block) if changed
           _close_file(path) if @opts[:eof_close]
           @logger.debug("End of file reached for #{path}")
           break

data/lib/filewatch/ext/tailbase.rb

@@ -94,7 +94,7 @@ module FileWatch::Ext
       if eof || delta >= @opts[:sincedb_write_interval]
         @logger.debug("writing sincedb (delta since last write = #{delta})") if @logger.debug?
         _sincedb_write
-        _progressdb_write(path, &block) if @opts[:progressdb]
+        _progressdb_write(path, eof, &block) if @opts[:progressdb]
         @sincedb_last_write = now
       end
     end
@@ -155,10 +155,20 @@ module FileWatch::Ext
     end
 
     protected
-    def _progressdb_write(path, &block)
-      @sincedb.each do |inode, meta|
+    def _progressdb_write(path, eof, &block)
+      if eof
+        inode = @statcache[path]
+        meta = @sincedb[@statcache[path]]
         line = [inode, meta[:size], meta[:pos]].flatten.join(" ")
         yield(path, line, :progressdb)
+      else
+        @statcache.each do |path, inode|
+          meta = @sincedb[inode]
+          if meta[:size] != meta[:pos]
+            line = [inode, meta[:size], meta[:pos]].flatten.join(" ")
+            yield(path, line, :progressdb)
+          end
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filewatch-ext
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dietmar Duft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filewatch