franz 1.5.14 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7aab957fbc2580ce928791cbcb37ed9ec8ff0cc
-  data.tar.gz: b346fa033b8d655a236057e724db5eec86462fad
+  metadata.gz: 18808363d0d50ff1f8420104d4146c7b674b809f
+  data.tar.gz: 58388a75b1fb9e762e57cbc23aade7a5edf5f07b
 SHA512:
-  metadata.gz: 1e2af7a1b87589221995b9b8f785bd6781a50355434b8f95b17c1ec293f2057c08a53071ba14d679e5cc7803777ff24c3cecd14c9a56bfd0b525ef6d053b2973
-  data.tar.gz: 530ba938fbc3efd9ac9357cc4871e66272c296810750f5d21fca6e6f764a9316e49fe59e07ba86287cf5929efec496587200207ca6089dd5b3e10db600c93adb
+  metadata.gz: bc6d8ca06961fc3f68b2642bbde14f3b22ba96b868c03b35f28a28ce651f56252f8d390063e0005eb68198fd376fdb9e11c1890c3c9e61887c0d93862c4947ae
+  data.tar.gz: 7c1b2175c06e53378d4ba860d9c2b878df70a1eafe7a1d963cb6155e5683352c4f272012dbeb2bb41c758fd5edfb560715a4212a0039769fd29eec877af2dbe0

data/VERSION

@@ -1 +1 @@
-1.5.14
+1.6.0

data/bin/franz

@@ -3,6 +3,7 @@ require 'json'
 require 'thread'
 require 'logger'
 
+require 'slog'
 require 'bunny'
 require 'trollop'
 require 'franz'
@@ -42,7 +43,14 @@ end
 Thread.abort_on_exception = true # Die quickly and with great ceremony
 
 config = Franz::Config.new opts[:config]
-logger = Franz::Logger.new opts[:debug], opts[:trace], opts[:log]
+
+level = :info
+level = :debug if opts[:debug]
+level = :trace if opts[:trace]
+colorize, prettify = false, false
+colorize, prettify = true, true if opts[:log].nil?
+opts[:log] ||= $stdout
+logger = Slog.new out: opts[:log], level: level
 
 io_bound = config[:output][:bound] || 10_000
 io = Queue.new

data/franz.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = Franz::SUMMARY
   s.description = Franz::SUMMARY + '.'
 
+  s.add_runtime_dependency 'slog', '~> 1'
   s.add_runtime_dependency 'bunny', '~> 1'
   s.add_runtime_dependency 'trollop', '~> 2'
   s.add_runtime_dependency 'colorize', '~> 0'

data/lib/franz.rb

@@ -3,7 +3,6 @@ require_relative 'franz/config'
 require_relative 'franz/discover'
 require_relative 'franz/input'
 require_relative 'franz/input_config'
-require_relative 'franz/logger'
 require_relative 'franz/metadata'
 require_relative 'franz/output'
 require_relative 'franz/tail'

data/test/test_franz_agg.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'pathname'
 require 'minitest/autorun'
 
+require 'slog'
 require 'deep_merge'
 
 require_relative '../lib/franz'

data/test/test_franz_discover.rb

@@ -4,6 +4,7 @@ require 'tempfile'
 require 'fileutils'
 require 'minitest/autorun'
 
+require 'slog'
 require 'deep_merge'
 
 require_relative '../lib/franz'

data/test/test_franz_tail.rb

@@ -4,6 +4,7 @@ require 'tempfile'
 require 'fileutils'
 require 'minitest/autorun'
 
+require 'slog'
 require 'deep_merge'
 
 require_relative '../lib/franz'

data/test/test_franz_watch.rb

@@ -4,6 +4,7 @@ require 'tempfile'
 require 'fileutils'
 require 'minitest/autorun'
 
+require 'slog'
 require 'deep_merge'
 
 require_relative '../lib/franz'

data/test/test_performance.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'pathname'
 require 'minitest/autorun'
 
+require 'slog'
 require 'deep_merge'
 
 require_relative '../lib/franz'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.6.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: slog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +115,6 @@ files:
 - lib/franz/discover.rb
 - lib/franz/input.rb
 - lib/franz/input_config.rb
-- lib/franz/logger.rb
 - lib/franz/metadata.rb
 - lib/franz/output.rb
 - lib/franz/sash.rb

data/lib/franz/logger.rb

@@ -1,73 +0,0 @@
-require 'logger'
-require 'time'
-
-require 'colorize'
-
-
-module Franz
-
-  # Extending the Logger with TRACE capabilities
-  class ::Logger
-    SEV_LABEL << 'TRACE'
-    TRACE = SEV_LABEL.index('TRACE') # N.B. TRACE is above other levels
-
-    # Send a TRACE-level log line
-    def trace progname, &block
-      add TRACE, nil, progname, &block if @trace
-    end
-  end
-
-  # 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 ]
-    }
-
-    # Create a new, colorful logger.
-    #
-    # @param debug [Boolean] enable DEBUG level logs
-    # @param out [File] output destination for logs
-    def initialize debug=false, trace=false, out=nil
-      colorize = out.nil?
-      out ||= $stdout
-      super out, 5, 104857600 # Keep max five logs at 100 [MiB] each
-      format colorize
-      @trace = true if trace
-      self.level = ::Logger::INFO
-      self.level = ::Logger::DEBUG if debug
-    end
-
-  private
-    def format colorize
-      self.formatter = proc do |severity, datetime, _, message|
-        severity.downcase!
-
-        message = { message: message } unless message.is_a? Hash
-
-        event = message.merge \
-          'level' => severity,
-          '@timestamp' => datetime.iso8601(3)
-
-        unless level == ::Logger::INFO
-          event.merge! marker: File::basename(caller[4])
-        end
-
-        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
-  end
-end