franz 2.1.14 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b563768b575bdc2c32f0c94e5b602fb48c8f05
-  data.tar.gz: dba0eff6f7e9a3d709374e9bf8c73c79703a543f
+  metadata.gz: cc7a5d6d178dc1e69c3bae41689803b001818b91
+  data.tar.gz: e95d2d372a2babcef729283e16065a6bcbff0d79
 SHA512:
-  metadata.gz: 7b09bc2fd25b9d47afc0b27f09bbb0ffcf68b15490c38500eec50739479ce1543d7a6f64cca170acd971fd80d8fc6a89c60e606fa48822270f78378f0fa0c85f
-  data.tar.gz: f9d1e1a68d7b4f90d816aa93a15e78b5610a621cdb20ba427943184eca24fd159772169aa0d7e3e0f314a66af4d5b82f89a43a914d0c66fb2ab222e4b169fc51
+  metadata.gz: aefde13b6cdf69d0bdda0ab5188762d478a291adb717e854d5532c2b2cb71f4f1e1dcc616eb537ce1f85d738f2da9160c6d3b10eae7005570743c583c166ada2
+  data.tar.gz: 992e197e977ac5b80117c01c25d9145661463a2a6e0f8d19c00136211f01485eccf96dbbe6c66e423a2df3a53b58cbe1640651bcd09c3794a16b0c319fd5d4b7

data/Readme.md

@@ -63,7 +63,7 @@ You can build a gem from this repository, or use RubyGems:
 Just call for help!
 
     $ franz --help
-    
+
           .--.,
         ,--.'  \  __  ,-.                 ,---,        ,----,
         |  | /\/,' ,'/ /|             ,-+-. /  |     .'   .`|
@@ -75,17 +75,16 @@ Just call for help!
         |  | |  |  , ;  /  /  ,.  | |   | |--'  ./__;     .'
         |  : \   ---'  ;  :   .'   \|   |/      ;   |  .'
         |  |,'         |  ,     .-./'---'       `---'
-        `--'            `--`---'                       v2.1.0
-    
-    
+        `--'            `--`---'                       v2.2.0
+
+
     Aggregate log file events and send them elsewhere
-    
+
     Usage: franz [<options>]
-    
+
     Options:
       --config, -c <s>:   Configuration file to use
            --debug, -d:   Enable debugging output
-           --trace, -t:   Enable trace output
          --log, -l <s>:   Log to file, not STDOUT
          --version, -v:   Print version and exit
             --help, -h:   Show this message
@@ -211,9 +210,9 @@ At Blue Jeans, we deploy Franz with Upstart. Here's a minimal config:
 
     #!upstart
     description "franz"
-    
+
     console log
-    
+
     start on startup
     stop on shutdown
     respawn
@@ -225,6 +224,11 @@ for Chef.
 
 ### Changelog
 
+### v2.2
+
+- Updated dependencies
+- No more `TRACE`-level logging (demoted to `DEBUG`)
+
 #### v2.1
 
 - Self-contained packages for OS X and Linux thanks to [Traveling Ruby](http://phusion.github.io/traveling-ruby) and [FPM](https://github.com/jordansissel/fpm)

data/VERSION

@@ -1 +1 @@
-2.1.14
+2.2.0

data/bin/franz

@@ -23,7 +23,6 @@ parser = Trollop::Parser.new do
   EOS
   opt :config, 'Configuration file to use', type: :string, required: true
   opt :debug,  'Enable debugging output', default: false
-  opt :trace,  'Enable trace output', default: false
   opt :log,    'Log to file, not STDOUT', type: :string, default: nil
 end
 
@@ -40,7 +39,6 @@ config = Franz::Config.new opts[:config]
 # Set up Slog to send pretty, colored output to STDOUT, compact to FILE
 level = :info
 level = :debug if opts[:debug]
-level = :trace if opts[:trace]
 device = opts[:log] || $stdout
 colorize, prettify = false, false
 colorize, prettify = true, true if device.tty? rescue false

data/lib/franz/agg.rb

@@ -90,7 +90,7 @@ module Franz
 
     def enqueue path, message
       if @ic.drop? path, message
-        log.trace \
+        log.debug \
           event: 'dropped',
           file: path,
           message: message
@@ -98,7 +98,7 @@ module Franz
       end
 
       unless @ic.keep? path, message
-        log.trace \
+        log.debug \
           event: 'unkept',
           file: path,
           message: message
@@ -107,14 +107,14 @@ module Franz
 
       t = @ic.type path
       if t.nil?
-        log.trace \
+        log.debug \
           event: 'enqueue skipped',
           file: path,
           message: message
         return
       end
 
-      log.trace \
+      log.debug \
         event: 'enqueue',
         file: path,
         message: message
@@ -142,7 +142,7 @@ module Franz
 
     def capture
       event = tail_events.shift
-      log.trace \
+      log.debug \
         event: 'capture',
         raw: event
       multiline = @ic.config(event[:path])[:multiline] rescue nil
@@ -153,7 +153,7 @@ module Franz
         lock[event[:path]].synchronize do
           size = buffer.size(event[:path])
           if size > @buffer_limit
-            log.trace \
+            log.debug \
               event: 'buffer overflow',
               file: event[:path],
               size: size,

data/lib/franz/output/device.rb

@@ -40,7 +40,7 @@ module Franz
               event['tags']  += opts[:tags]
             end
 
-            log.trace \
+            log.debug \
               event: 'publish',
               raw: event
 

data/lib/franz/output/http.rb

@@ -79,7 +79,7 @@ module Franz
               enqueue payload
             end
 
-            log.trace \
+            log.debug \
               event: 'publish',
               raw: event
           end

data/lib/franz/output/kafka.rb

@@ -87,7 +87,7 @@ module Franz
               event['tags']  += opts[:tags]
             end
 
-            log.trace \
+            log.debug \
               event: 'publish',
               raw: event
 

data/lib/franz/output/rabbitmq.rb

@@ -66,7 +66,7 @@ module Franz
               event['tags']  += opts[:tags]
             end
 
-            log.trace \
+            log.debug \
               event: 'publish',
               raw: event
 

data/lib/franz/tail.rb

@@ -77,7 +77,7 @@ module Franz
 
 
     def read path, size
-      log.trace \
+      log.debug \
         event: 'read',
         file: path,
         size: size
@@ -173,7 +173,7 @@ module Franz
 
 
     def close path
-      log.trace event: 'close', file: path
+      log.debug event: 'close', file: path
       tail_events.push path: path, line: buffer[path].flush
       @nil_read.delete path
       @cursors[path] = 0
@@ -182,7 +182,7 @@ module Franz
 
     def handle event
       path, size = event[:path], event[:size]
-      log.trace \
+      log.debug \
         event: 'handle',
         raw: event
       case event[:name]

data/lib/franz/watch.rb

@@ -95,7 +95,7 @@ module Franz
     def log ; @logger end
 
     def enqueue name, path, size=nil
-      log.trace \
+      log.debug \
         event: 'enqueue',
         name: name,
         file: path,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 2.1.14
+  version: 2.2.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slog
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -184,4 +184,3 @@ test_files:
 - test/test_franz_tail.rb
 - test/test_franz_watch.rb
 - test/test_performance.rb
-has_rdoc: