franz 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf1ac1563f7fefe2eaa7b8734dc4a61f994eb45
-  data.tar.gz: 959e4178e46f5f67d4198aafdf8edac7d1e677ec
+  metadata.gz: f1b893a08216930ae54c7bc089190ced39575a27
+  data.tar.gz: a7bc30fcd0e71b6a0305f1532e1917e44898672e
 SHA512:
-  metadata.gz: 4ae60dd86a2fbc863f5b2158e240fd3f6b9a819c41171a13cbed37afea872ca033a36c73760cdbd87749803cd679721c93e2547e23eb5ad2f60b63f84594a61e
-  data.tar.gz: c6e61eb90bc7f4fd32d900e26eb263e9af715ee048ba9473dc07f72fbd171466121ed1950e27b481c50f38fd3a624d706eb2ac4da4e4947259f27ce30d398652
+  metadata.gz: 47c16c78ba9ee896c7e4628fb5e58ac93cb7ce51b8a707e3a275318b799179abeae57d60ff97d36405188e47ab3134bd0dbd2784dbeea81146f19467fe141193
+  data.tar.gz: 5c8a3783775c21e0c43d3f2b96f7e5cb27b7eed0dafc05fa5d7bfe5508f768df29e33eec983b335cb1fc62999767edf142f44130c1f08309e185916bb53f93fc

data/VERSION

@@ -1 +1 @@
-1.5.8
+1.5.9

data/lib/franz/input.rb

@@ -102,7 +102,8 @@ module Franz
         watch_interval: opts[:input][:watch_interval],
         play_catchup?: opts[:input][:play_catchup?],
         logger: opts[:logger],
-        stats: stats
+        stats: stats,
+        cursors: cursors
 
       @tail = Franz::Tail.new \
         input_config: ic,

data/lib/franz/logger.rb

@@ -50,10 +50,13 @@ module Franz
 
         message = { message: message } unless message.is_a? Hash
 
-        event = {
+        event = message.merge \
           'level' => severity,
           '@timestamp' => datetime.iso8601(3)
-        }.merge message
+
+        unless level == ::Logger::INFO
+          event.merge! marker: File::basename(caller[4])
+        end
 
         if colorize # console output
           event = JSON::pretty_generate(event) + "\n"

data/lib/franz/tail.rb

@@ -74,9 +74,10 @@ module Franz
       @cursors[path] ||= 0
       spread = size - @cursors[path]
 
-      if spread <= 0
-        log.trace \
-          event: 'ignoring read',
+      # Not convinced this would ever happen...
+      if spread < 0
+        log.error \
+          event: 'negative spread',
           path: path,
           size: size,
           cursor: @cursors[path],
@@ -102,15 +103,17 @@ module Franz
           data = nil
         end
 
-        if data.nil? # Old file went away
+        if data.nil?
+          # 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 \
             event: 'nil read',
             path: path,
             size: size,
             cursor: @cursors[path],
             spread: (size - @cursors[path])
-          @cursors[path] = 0
-          next
+          return
         end
 
         data_size = data.bytesize
@@ -154,10 +157,7 @@ module Franz
         event: 'handle',
         raw: event
       case event[:name]
-      when :replaced
-        close event[:path]
-        read event[:path], event[:size]
-      when :truncated
+      when :replaced, :truncated
         close event[:path]
         read event[:path], event[:size]
       when :appended

data/lib/franz/watch.rb

@@ -35,7 +35,7 @@ module Franz
       if @play_catchup
         log.debug event: 'play catchup'
         stats.keys.each do |path|
-          stats[path][:size] = 0
+          stats[path][:size] = opts[:cursors][path] || 0
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Sean Clemmer