franz 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd7ded091e8791fdf52b423e2a66895e48dfd0f3
-  data.tar.gz: 5aca71dcd6052cbb2a147884b86de8141c505664
+  metadata.gz: 15ec73cb6037c16c59a295c5d1e17160edfcff2b
+  data.tar.gz: 0e68faaa4df6f3d52d4f563c288aeca74b7cb72c
 SHA512:
-  metadata.gz: 4f51b1de2cac2128ee0bac0cc728ba08657c773a52965083e6c88d2dca9e5ebffac09276484c863c1d1bfdd993982b605ea9135d252dd17be648038df75e7ebe
-  data.tar.gz: 7ef909db8aca7ce60a1fde825d86f8113bbd1d3fdcf7a3454ace72fed0baadff0522b7637aab72e658eb7ac00a1cc03f25a3a3c8006df43fbdf2fdd1a1317ce8
+  metadata.gz: 7d4156f5ace594a8d7ed5846efe1d05f1b2eb23c38038bd526516dc9b351e6e4fe3bfcc2e90a79f6f36ef6b67625c51531ecf8dc359eb542a9d8995f21206794
+  data.tar.gz: 884ff2d8cae0b911310efb98d1203d2b28685c1b15c8f7e756c96deeade3ac41079a8c75bdc2b59c3880e9f529b072fb1c8ec66852a746f0e82b48b95506ef2c

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.6.5

data/lib/franz/agg.rb

@@ -92,7 +92,7 @@ module Franz
       if @ic.drop? path, message
         log.trace \
           event: 'dropped',
-          path: path,
+          file: path,
           message: message
         return
       end
@@ -101,25 +101,25 @@ module Franz
       if t.nil?
         log.trace \
           event: 'enqueue skipped',
-          path: path,
+          file: path,
           message: message
         return
       end
 
       log.trace \
         event: 'enqueue',
-        path: path,
+        file: path,
         message: message
       s = seq path
       m = message.encode 'UTF-8', invalid: :replace, undef: :replace, replace: '?'
 
-      event = { type: t, host: @@host, '@seq' => s }
+      event = { type: t, host: @@host, path: path, '@seq' => s }
 
       if @ic.json? path
         return if m =~ /^#/
-        event = JSON::parse(m).merge(event)
+        event.merge! JSON::parse(m)
       else
-        event.merge! message: m, path: path
+        event.merge! message: m
       end
       agg_events.push event
     end
@@ -139,7 +139,7 @@ module Franz
           if size > @buffer_limit
             log.trace \
               event: 'buffer overflow',
-              path: event[:path],
+              file: event[:path],
               size: size,
               limmit: @buffer_limit
           end

data/lib/franz/discover.rb

@@ -51,7 +51,7 @@ class Franz::Discover
           @statz.inc :num_deleted
           log.debug \
             event: 'discover deleted',
-            path: d
+            file: d
         end
 
         discover.each do |discovery|
@@ -60,7 +60,7 @@ class Franz::Discover
           @statz.inc :num_discovered
           log.debug \
             event: 'discover discovered',
-            path: discovery
+            file: discovery
         end
         sleep discover_interval
       end

data/lib/franz/input_config.rb

@@ -55,7 +55,7 @@ module Franz
         end
         log.warn \
           event: 'type unknown',
-          path: path
+          file: path
         @types[path] = nil
         return nil
       end

data/lib/franz/tail.rb

@@ -79,7 +79,7 @@ module Franz
     def read path, size
       log.trace \
         event: 'read',
-        path: path,
+        file: path,
         size: size
       @cursors[path] ||= 0
       spread = size - @cursors[path]
@@ -92,7 +92,7 @@ module Franz
         if spread.abs > @block_size
           log.warn \
             event: 'large spread',
-            path: path,
+            file: path,
             size: size,
             cursor: @cursors[path],
             spread: spread
@@ -103,7 +103,7 @@ module Franz
       if spread > @read_limit
         log.warn \
           event: 'large read',
-          path: path,
+          file: path,
           size: size,
           cursor: @cursors[path],
           spread: spread
@@ -129,7 +129,7 @@ module Franz
           # :rotated, :deleted event comes along soon after. If it doesn't...
           log.error \
             event: 'nil read',
-            path: path,
+            file: path,
             size: size,
             cursor: @cursors[path],
             spread: (size - @cursors[path]),
@@ -147,7 +147,7 @@ module Franz
         rescue RuntimeError
           log.fatal \
             event: 'buffer full',
-            path: path,
+            file: path,
             size: size,
             cursor: @cursors[path],
             spread: (size - @cursors[path])
@@ -160,7 +160,7 @@ module Franz
       if @cursors[path] < size
         log.fatal \
           event: 'incomplete read',
-          path: path,
+          file: path,
           size: size,
           cursor: @cursors[path],
           spread: (size - @cursors[path])
@@ -170,7 +170,7 @@ module Franz
 
 
     def close path
-      log.trace event: 'close', path: path
+      log.trace event: 'close', file: path
       tail_events.push path: path, line: buffer[path].flush
       @nil_read.delete path
       @cursors[path] = 0

data/lib/franz/watch.rb

@@ -94,7 +94,7 @@ module Franz
       log.trace \
         event: 'enqueue',
         name: name,
-        path: path,
+        file: path,
         size: size
       watch_events.push name: name, path: path, size: size
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slog