franz 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1b893a08216930ae54c7bc089190ced39575a27
-  data.tar.gz: a7bc30fcd0e71b6a0305f1532e1917e44898672e
+  metadata.gz: 4a2225626aaa28e072d55bcb249af3861f98473d
+  data.tar.gz: 6c0dca54875a2c75b4513cdf5b6af30542220c70
 SHA512:
-  metadata.gz: 47c16c78ba9ee896c7e4628fb5e58ac93cb7ce51b8a707e3a275318b799179abeae57d60ff97d36405188e47ab3134bd0dbd2784dbeea81146f19467fe141193
-  data.tar.gz: 5c8a3783775c21e0c43d3f2b96f7e5cb27b7eed0dafc05fa5d7bfe5508f768df29e33eec983b335cb1fc62999767edf142f44130c1f08309e185916bb53f93fc
+  metadata.gz: 922d78336e5f9fbf5964a9df7b28624f3c3fa1d0178b307595cefb0397d5c50cf89b5ff23536218fb0ba5fa22687841a89a389f397d6bc1135941d66ca1b57c0
+  data.tar.gz: 08204709d968ce6ff1f7bd5c1d8243f3e9437048f4510e1abca88160933760326360b3af9dd6e76da410de9ce833ab70af909a3e69cfe75a20aaa180f5a50ecd

data/VERSION

@@ -1 +1 @@
-1.5.9
+1.5.10

data/lib/franz/agg.rb

@@ -109,12 +109,13 @@ module Franz
       s = seq path
       m = message.encode 'UTF-8', invalid: :replace, undef: :replace, replace: '?'
 
-      event = { path: path, type: t, host: @@host, '@seq' => s }
+      event = { type: t, host: @@host, '@seq' => s }
+
       if @ic.json? path
         return if m =~ /^#/
-        event.merge! JSON::parse(m)
+        event = JSON::parse(m).merge(event)
       else
-        event.merge! message: m
+        event.merge! message: m, path: path
       end
       agg_events.push event
     end

data/lib/franz/tail.rb

@@ -99,8 +99,13 @@ module Franz
 
         begin
           data = IO::read path, @block_size, @cursors[path]
-        rescue EOFError, Errno::ENOENT
+          reason_for_nil_data = 'unknown'
+        rescue EOFError
           data = nil
+          reason_for_nil_data = 'eof'
+        rescue Errno::ENOENT
+          data = nil
+          reason_for_nil_data = 'noent'
         end
 
         if data.nil?
@@ -112,7 +117,8 @@ module Franz
             path: path,
             size: size,
             cursor: @cursors[path],
-            spread: (size - @cursors[path])
+            spread: (size - @cursors[path]),
+            reason: reason_for_nil_data
           return
         end
 

metadata

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