franz 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b61962daa55224e0eb1efa72d798c7fde52d7be
-  data.tar.gz: cf9fc730fe89c22a38d22a09abb97f3bf2d519f0
+  metadata.gz: 05a395b2d10064db126d23875c069f0a4ca69ec3
+  data.tar.gz: 20fe5d0196a3172f3647161e43f8bf07638d9ae1
 SHA512:
-  metadata.gz: 1b51f2ffcf4e46a3d74b7fcc3f8da9bff0c25a2282be4ab26b7e41b5d54680a539bda0ba90f1f4ab7bd2672eaa468827a0b53adb4bed551047b98855ad6f20a4
-  data.tar.gz: 50e900518fa5017fcc28396e93b8acbe39ca124b44b5a47512815b9c5a6e39c191f0b608fb746d6e76cab5ddf17a876f1645476b730005aabeef9b7bc78599e7
+  metadata.gz: a629498d8e9865d1df45ba2aa9ae3cd21cd9f285057ca1684cb7b2ea47bcfda0588456c10655aa183a668f1d85f665a41f014abf4628e43aa2fb25de35af44a2
+  data.tar.gz: f0859c346bd2e5703085f790de79afb29b0ae7e68e77ae1a21291572dae304681dac6fa9d9f17b3b3e7fd0538a44a65a15f5a9a14fac1d4fa8a1a6e680824a03

data/VERSION

@@ -1 +1 @@
-1.5.3
+1.5.4

data/lib/franz/logger.rb

@@ -50,7 +50,10 @@ module Franz
       self.formatter = proc do |severity, datetime, _, message|
         if colorize
           if level == 1
-            event = { timestamp: Time.now.iso8601(6) }.merge(message)
+            event = {
+              level: severity.downcase,
+              timestamp: Time.now.iso8601(6)
+            }.merge(message)
             JSON::generate(event).colorize(
               color: SEVERITY_COLORS[severity.to_s][0],
               background: SEVERITY_COLORS[severity.to_s][1]
@@ -68,7 +71,10 @@ module Franz
           end
         else # plain
           if level == 1
-            event = { timestamp: Time.now.iso8601(6) }.merge(message)
+            event = {
+              level: severity.downcase,
+              timestamp: Time.now.iso8601(6)
+            }.merge(message)
             JSON::generate(event) + "\n"
           else
             long_format % [

data/lib/franz/tail.rb

@@ -93,6 +93,8 @@ module Franz
           spread: spread
       end
 
+      nil_reads = 0
+
       loop do
         break if @cursors[path] >= size
 
@@ -107,14 +109,29 @@ module Franz
         # just reset the cursor and bail; hopefully we'll get a
         # "rotated" event from Watch in the near future.
         if data.nil?
+          nil_reads += 1
+
           log.warn \
             event: 'nil read',
             path: path,
             size: size,
             cursor: @cursors[path],
             spread: (size - @cursors[path])
+
+          if nil_reads >= 100
+            log.error \
+              event: 'nil read loop',
+              path: path,
+              size: size,
+              cursor: @cursors[path],
+              spread: (size - @cursors[path])
+            @cursors[path] = 0
+            return
+          end
+
           next
         end
+
         data_size = data.bytesize
 
         begin

metadata

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