franz 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a395b2d10064db126d23875c069f0a4ca69ec3
-  data.tar.gz: 20fe5d0196a3172f3647161e43f8bf07638d9ae1
+  metadata.gz: 002cdbcf468f836461f433dcac17b46bae72d6d4
+  data.tar.gz: 6d8ff2477e002e1430ea7e5f6123ac0bad96ef27
 SHA512:
-  metadata.gz: a629498d8e9865d1df45ba2aa9ae3cd21cd9f285057ca1684cb7b2ea47bcfda0588456c10655aa183a668f1d85f665a41f014abf4628e43aa2fb25de35af44a2
-  data.tar.gz: f0859c346bd2e5703085f790de79afb29b0ae7e68e77ae1a21291572dae304681dac6fa9d9f17b3b3e7fd0538a44a65a15f5a9a14fac1d4fa8a1a6e680824a03
+  metadata.gz: 9df6ecca70bdc52d7b6d5e307612a911ded05ecc925a3771be33eff5f9fe4ac6820bcf2550e97c2b4f876ff4219f09f5222174034be7fa197fd4a7c63b2ecd7a
+  data.tar.gz: 067961fe1616a5244781b4ddc248cbcc4a549ea2f183485b79aae6831684b927a27f724f05afb089b3bb977a6bf2975e9e9d65d040a545be88f764bd3ab46196

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

data/lib/franz/logger.rb

@@ -16,16 +16,16 @@ module Franz
     end
   end
 
-  # A powerful, colorful logger for Franz.
+  # A colorful JSON logger for Franz.
   class Logger < Logger
     # Maps each log level to a unique combination of fore- and background colors
     SEVERITY_COLORS = {
-      'DEBUG' => [ :blue,    :default ],
-      'INFO'  => [ :green,   :default ],
-      'WARN'  => [ :yellow,  :default ],
-      'ERROR' => [ :red,     :default ],
-      'FATAL' => [ :red,     :black   ],
-      'TRACE' => [ :magenta, :default ]
+      'debug' => [ :blue,    :default ],
+      'info'  => [ :green,   :default ],
+      'warn'  => [ :yellow,  :default ],
+      'error' => [ :red,     :default ],
+      'fatal' => [ :red,     :black   ],
+      'trace' => [ :magenta, :default ]
     }
 
     # Create a new, colorful logger.
@@ -44,46 +44,24 @@ module Franz
 
   private
     def format colorize
-      short_format = "%s\n"
-      long_format  = "%s [%s] %s -- %s\n"
-
       self.formatter = proc do |severity, datetime, _, message|
-        if colorize
-          if level == 1
-            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]
-            ) + "\n"
-          else
-            long_format.colorize(
-              color: SEVERITY_COLORS[severity.to_s][0],
-              background: SEVERITY_COLORS[severity.to_s][1]
-            ) % [
-              severity,
-              datetime.iso8601(6),
-              File::basename(caller[4]),
-              message
-            ]
-          end
-        else # plain
-          if level == 1
-            event = {
-              level: severity.downcase,
-              timestamp: Time.now.iso8601(6)
-            }.merge(message)
-            JSON::generate(event) + "\n"
-          else
-            long_format % [
-              severity,
-              datetime.iso8601(6),
-              File::basename(caller[4]),
-              message
-            ]
-          end
+
+        message = { message: message } unless message.is_a? Hash
+
+        event = {
+          severity: severity.downcase!,
+          timestamp: datetime.iso8601(6),
+          marker: File::basename(caller[4])
+        }.merge(message)
+
+        if colorize # console output
+          event = JSON::pretty_generate(event) + "\n"
+          event.colorize \
+            color: SEVERITY_COLORS[severity][0],
+            background: SEVERITY_COLORS[severity][1]
+
+        else # logging to file
+          event = JSON::generate(event) + "\n"
         end
       end
     end

data/lib/franz/output.rb

@@ -37,7 +37,8 @@ module Franz
       rabbit = Bunny.new opts[:output][:connection].merge({
         network_recovery_interval: 10.0,
         continuation_timeout: 10_000,
-        threaded: false
+        threaded: false,
+        logger: @logger
       })
 
       rabbit.start

data/lib/franz/tail.rb

@@ -8,7 +8,7 @@ module Franz
   # Tail receives low-level file events from a Watch and handles the actual
   # reading of files, providing a stream of lines.
   class Tail
-    ERR_NIL_READ = 1
+    ERR_BUFFER_FULL = 1
     ERR_INVALID_EVENT = 2
     ERR_INCOMPLETE_READ = 3
 
@@ -93,42 +93,23 @@ module Franz
           spread: spread
       end
 
-      nil_reads = 0
-
       loop do
         break if @cursors[path] >= size
 
         begin
           data = IO::read path, @block_size, @cursors[path]
         rescue EOFError, Errno::ENOENT
-          next
+          data = nil
         end
 
-        # Handle issue with IO::read, which seems to return nil when
-        # the file in question has been rotated. In such a case, we'll
-        # 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
-
+        if data.nil? # Old file went away
           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
-
+          @cursors[path] = 0
           next
         end
 
@@ -145,7 +126,7 @@ module Franz
             size: size,
             cursor: @cursors[path],
             spread: (size - @cursors[path])
-          exit ERR_NIL_READ
+          exit ERR_BUFFER_FULL
         end
 
         @cursors[path] += data_size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny