franz 1.4.26 → 1.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 044bc9e0faba2b10d049575a4259f05c26c828c8
-  data.tar.gz: f1af495b6a4131540d1e12b6c738879bf5f23f3f
+  metadata.gz: 8020965f21e589c9a82a1c9467a7c8b404603b86
+  data.tar.gz: 5185f14e0811997c82f6c5445baacc0458e4357f
 SHA512:
-  metadata.gz: 8053bd7ab0813845a5369cc230e297a44ff5fc8df2ec8aef2c5ebe817f01999509402b0de3eb839a6b731e10f2e5a66be47d2b95578eadc124e99ae261684ecc
-  data.tar.gz: 4b67a066cac28a3271b2c0131acdea2210921320fa8142ce0c9bdbb9833b86484b7d5dd123e20bb64b648d76ff1526a7212bc9d6f396560be530409669044d7b
+  metadata.gz: 4fa690fd0725c4525537da30964cab5151511b1e33ca48bbcca24e592e844548e98512401e47073e0248de76740134d77800a06db62b3aa0db79e4d27e547005
+  data.tar.gz: ae0fd575ede813e61101e33f87e06e5dd381ef0ad139c749c803da0425ae1e4b0583cb6518ee7219281b76822b44e69e60cbbc4bcfdece520e0a3ca7dc61fb53

data/VERSION

@@ -1 +1 @@
-1.4.26
+1.4.27

data/lib/franz/agg.rb

@@ -51,9 +51,6 @@ module Franz
         capture until @stop
       end
 
-      @last_checkin = Time.new 0
-      @checkin_interval = 60
-
       log.debug \
         event: 'agg started',
         configs: @configs,
@@ -83,13 +80,6 @@ module Franz
 
     def log ; @logger end
 
-    def checkin now=Time.now
-      if @last_checkin < now - @checkin_interval
-        log.warn event: 'checkin', buffer_size: @buffer.length
-        @last_checkin = now
-      end
-    end
-
     def type path
       begin
         @types.fetch path
@@ -168,7 +158,6 @@ module Franz
       log.trace \
         event: 'capture',
         raw: event
-      checkin
       multiline = config(event[:path])[:multiline] rescue nil
       if multiline.nil?
         enqueue event[:path], event[:line] unless event[:line].empty?

data/lib/franz/tail.rb

@@ -30,9 +30,6 @@ module Franz
         handle(watch_events.shift) until @stop
       end
 
-      @last_checkin = Time.new 0
-      @checkin_interval = 60
-
       log.debug \
         event: 'tail started',
         watch_events: watch_events,
@@ -62,13 +59,6 @@ module Franz
 
     def log ; @logger end
 
-    def checkin now=Time.now
-      if @last_checkin < now - @checkin_interval
-        log.warn event: 'checkin', cursors_size: @cursors.length
-        @last_checkin = now
-      end
-    end
-
     def read path, size
       log.trace \
         event: 'read',
@@ -76,29 +66,58 @@ module Franz
         size: size
       @cursors[path] ||= 0
       spread = size - @cursors[path]
+
       if spread > @read_limit
-        log.warn event: 'large read', path: path, spread: spread
+        log.trace \
+          event: 'large read',
+          path: path,
+          size: size,
+          cursor: @cursors[path],
+          spread: spread
       end
+
       loop do
         break if @cursors[path] >= size
 
         begin
           data = IO::read path, @block_size, @cursors[path]
-          if data.nil?
-            log.fatal event: 'nil read', path: path
-            break
-          end
-          size = data.bytesize
+        rescue EOFError
+          log.warn event: 'read EOF', path: path
+          next
+        rescue Errno::ENOENT
+          log.warn event: 'read ENOENT', path: path
+          next
+        end
+
+        if data.nil?
+          log.fatal event: 'nil read', path: path
+          exit 2
+          raise 'nil read'
+        end
+        size = data.bytesize
+
+        begin
           buffer[path].extract(data).each do |line|
             tail_events.push path: path, line: line
           end
-          @cursors[path] += size
         rescue RuntimeError
           log.fatal event: 'buffer full', path: path
-          break
-        rescue EOFError, Errno::ENOENT
-          # we're done here
+          exit 2
+          raise 'buffer full'
         end
+
+        @cursors[path] += size
+      end
+
+      if @cursors[path] < size
+        log.fatal \
+          event: 'incomplete read',
+          path: path,
+          size: size,
+          cursor: @cursors[path],
+          spread: (size - @cursors[path])
+        exit 2
+        raise 'incomplete read'
       end
     end
 
@@ -112,10 +131,7 @@ module Franz
       log.trace \
         event: 'handle',
         raw: event
-      checkin
       case event[:name]
-      when :created
-        # nop
       when :replaced
         log.warn event: 'replaced', raw: event
         close event[:path]
@@ -130,8 +146,9 @@ module Franz
         log.warn event: 'deleted', raw: event
         close event[:path]
       else
-        log.warn event: 'invalid event', raw: event
+        log.fatal event: 'invalid event', raw: event
         exit 2
+        raise 'invalid event'
       end
       return event[:path]
     end

data/lib/franz/watch.rb

@@ -105,21 +105,16 @@ module Franz
         stat = stat_for path
         stats[path] = stat
 
-        if file_created? old_stat, stat
-          # enqueue :created, path
-        elsif file_deleted? old_stat, stat
-          log.warn event: 'deleted!', path: path
+        if file_deleted? old_stat, stat
           enqueue :deleted, path
           deleted << path
         end
 
         if file_replaced? old_stat, stat
-          log.warn event: 'replaced!', path: path
           enqueue :replaced, path, stat[:size]
         elsif file_appended? old_stat, stat
           enqueue :appended, path, stat[:size]
         elsif file_truncated? old_stat, stat
-          log.warn event: 'truncated!', path: path
           enqueue :truncated, path, stat[:size]
         end
       end

metadata

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