franz 1.5.12 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022d5282e7924696be82dca5a9210acbc4d55a6f
-  data.tar.gz: 08368537b4c26ffcbe125a2b9cf018052707d3f5
+  metadata.gz: fe1f11e03a934496042b3aadcc81e40d2cf59b67
+  data.tar.gz: 81bbfd598e84fef1c52c9be4e3fe929d27d962c6
 SHA512:
-  metadata.gz: 4fa3dcab4866a10fcf5207d688824eff8bd04fcbb4beb32551cb8be5259780924a9b214482615d7a62b20451fdefc6162b78db698cdaf8949330d47c0b9ad2fb
-  data.tar.gz: 689b0bd557e963ec683282876c5b918c04e4db5033f4f2e26b0743a4f39e27e83b9e6308b8c99c76cdf27b5d722036a4ea715dd989ed945419a2a9baa911705e
+  metadata.gz: e1aeabe202b7b2de60fe7712339fd9d379a9fcff7bdc2faef9c7720bc9e0915d45d8ed07b2bf98e0e2181c64a083fe8f7ced1541e1ac464a9c1441a22d6c1e27
+  data.tar.gz: 7562b1f45a366d3f28c98ba4e84a81831479b2cdb0a10218a3bdebf8468ac7e4d708653b7d414cc68022713d0c0f1382ba3492be580a52f4026e8b0fa72d91b5

data/VERSION

@@ -1 +1 @@
-1.5.12
+1.5.13

data/lib/franz/tail.rb

@@ -30,8 +30,9 @@ module Franz
       @cursors    = opts[:cursors]    || Hash.new
       @logger     = opts[:logger]     || Logger.new(STDOUT)
 
+      @nil_read = Hash.new { |h,k| h[k] = false }
       @buffer = Hash.new { |h, k| h[k] = BufferedTokenizer.new("\n", @line_limit) }
-      @stop   = false
+      @stop = false
 
       @tail_thread = Thread.new do
         handle(watch_events.shift) until @stop
@@ -66,6 +67,7 @@ module Franz
 
     def log ; @logger end
 
+
     def read path, size
       log.trace \
         event: 'read',
@@ -74,19 +76,24 @@ module Franz
       @cursors[path] ||= 0
       spread = size - @cursors[path]
 
-      # Not convinced this would ever happen...
+      # A negative spread size means we've probably worked ahead of ourselves.
+      # In such a case, we'll ignore the request, as it's likely been fulfilled.
+      # We only need to worry if the spread size grows larger than the block
+      # size--that means something other than us reading threw Franz off...
       if spread < 0
-        log.error \
-          event: 'negative spread',
-          path: path,
-          size: size,
-          cursor: @cursors[path],
-          spread: spread
+        if spread.abs > @block_size
+          log.warn \
+            event: 'large spread',
+            path: path,
+            size: size,
+            cursor: @cursors[path],
+            spread: spread
+        end
         return
       end
 
       if spread > @read_limit
-        log.trace \
+        log.warn \
           event: 'large read',
           path: path,
           size: size,
@@ -112,13 +119,14 @@ module Franz
           # Not so sure of myself here: It's been truncated, it's been rotated,
           # or else it no longer exists. We "return" in hopes that a :truncated,
           # :rotated, :deleted event comes along soon after. If it doesn't...
-          log.warn \
+          log.error \
             event: 'nil read',
             path: path,
             size: size,
             cursor: @cursors[path],
             spread: (size - @cursors[path]),
             reason: reason_for_nil_data
+          @nil_read[path] = true
           return
         end
 
@@ -152,29 +160,47 @@ module Franz
       end
     end
 
+
     def close path
       log.trace event: 'close', path: path
       tail_events.push path: path, line: buffer[path].flush
+      @nil_read.delete path
       @cursors[path] = 0
     end
 
+
     def handle event
+      path, size = event[:path], event[:size]
       log.trace \
         event: 'handle',
         raw: event
       case event[:name]
+
+      when :deleted
+        close path
+
       when :replaced, :truncated
-        close event[:path]
-        read event[:path], event[:size]
+        close
+        read path, size
+
       when :appended
-        read event[:path], event[:size]
-      when :deleted
-        close event[:path]
+        # Ignore read requests after a nil read. We'll wait for the next
+        # event that tells us to close the file. Fingers crossed...
+        unless @nil_read[path]
+          read path, size
+
+        else # following a nil read
+          log.debug \
+            event: 'skipping read',
+            raw: event
+        end
+
       else
         log.fatal event: 'invalid event', raw: event
         exit ERR_INVALID_EVENT
       end
-      return event[:path]
+
+      return path
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.13
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny