franz 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ab67878a33a64705a5a546e9e98616c763a1007
-  data.tar.gz: 94d3def362509f2a8804fd99914ccf3d2d03f926
+  metadata.gz: 98e3643c3a665282fa261b24ffc11703d31b7d4f
+  data.tar.gz: 3ffac79b8b665635a53daf79a5a45fea8c95085a
 SHA512:
-  metadata.gz: ed1e406ff1202a326e49c874ebdebfe50ba55281564a3ab4d28e546f953f2c072478eb9bae5bb66923f91da60e36ce859e7b2bbe06d0e71fc5925a5fa40aaaf4
-  data.tar.gz: 0e471cbe59903ce9f1220431ff6a0d96972306b690b197d4badf762a97e5ffa421046374bb862e9cc5456d2fe41054c8b2f927d9f0415433bdcbf16aed8b24a2
+  metadata.gz: 6528dc6195f95e35a67e7266af4ace7a5bbbaa0b5181f7141839008bd769c4f59fe090d4d1badd2adc35058aa4605f52c1fc099c57b03dcbef0ab2f3279fcb0c
+  data.tar.gz: 42d947ca88f7afa6ed88e284a951aa79df4d8155389856fda1c76a2a98acb4adbe089d0e74dc14a2e1d8a33a9dc7a8222e6cb999704651543f37be3a63875fd1

data/Readme.md

@@ -229,6 +229,7 @@ for Chef.
 - Updated dependencies, improved packaging
 - No more `TRACE`-level logging (demoted to `DEBUG`)
 - Better command-line options backed by environment variables
+- Basic Auth support in HTTP output
 
 
 #### v2.1

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/lib/franz/output/http.rb

@@ -24,7 +24,7 @@ module Franz
           tags: [],
           input: [],
           output: {
-            server: 'http://localhost:3000',
+            uri: 'http://user:pass@localhost:3000/v2/.theon',
             flush_size: 500,
             flush_interval: 10,
             ssl: {
@@ -44,9 +44,9 @@ module Franz
         @stop = false
         @foreground = opts[:foreground]
 
-        server = opts[:output].delete :server
-        @uri   = URI(server)
-        @ssl   = if @uri.scheme =~ /https/
+        uri  = opts[:output].delete(:uri) || opts[:output].delete(:server)
+        @uri = URI(uri)
+        @ssl = if @uri.scheme =~ /https/
           opts[:output].delete :ssl
         end
         open_uri
@@ -164,6 +164,7 @@ module Franz
 
       def emit body
         request = Net::HTTP::Post.new(@uri)
+        request.basic_auth @uri.user, @uri.password if @uri.user
         request.body = body
         @http.request(request)
       rescue EOFError, Errno::ECONNREFUSED, Errno::EPIPE

data/test/Dockerfile

@@ -0,0 +1,16 @@
+FROM phusion/baseimage:0.9.18
+
+MAINTAINER Sean Clemmer <sczizzo@gmail.com>
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY ./ /tmp/franz/
+
+RUN apt-get update \
+ && apt-get install -y libtool libsnappy1 libsnappy-dev \
+ && rm -rf /tmp/* \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN ls -la /tmp/franz
+
+CMD [ "whoami" ]

data/test/test_performance.rb

@@ -12,9 +12,13 @@ require_relative '../lib/franz'
 
 Thread.abort_on_exception = true
 
+# Work around Docker limits
+def docker? ; File.exist? '.docker' end
+
+
 class TestPerformance < MiniTest::Test
   def setup
-    @ulimit = Process.getrlimit(:NOFILE).first
+    @ulimit = docker? ? 512 : Process.getrlimit(:NOFILE).first
 
     @discover_interval = 2
     @watch_interval    = 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slog
@@ -149,6 +149,7 @@ files:
 - lib/franz/stats.rb
 - lib/franz/tail.rb
 - lib/franz/watch.rb
+- test/Dockerfile
 - test/test_franz_agg.rb
 - test/test_franz_discover.rb
 - test/test_franz_tail.rb
@@ -179,6 +180,7 @@ signing_key:
 specification_version: 4
 summary: Aggregate log file events and send them elsewhere
 test_files:
+- test/Dockerfile
 - test/test_franz_agg.rb
 - test/test_franz_discover.rb
 - test/test_franz_tail.rb