franz 1.6.8 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 534266b50947164948680fd3bb213ea0fb5087b8
-  data.tar.gz: 4a71b6fe4c42585a61f2389e22e672b77d9e45c9
+  metadata.gz: 02a31ad79327096a6556900d4d5e9c98cb10cbf5
+  data.tar.gz: 6f297b8ba0b6167067cc99172712abd140f008c6
 SHA512:
-  metadata.gz: 50946774f5019acea486d535ba6eac54c32aad3dcfd0ce19d5d2db53e637f2744388b586a32ebf02eb077e6163e93962b977f4b9014074747e9d4cc5ecad6064
-  data.tar.gz: e9cc52de649586b6574e0c23dba483b1c9aed040babf2ab4391338b92a85dbfac59372f9f537d657e9008afcec10dcebb2327d3dd0a917f156d757f6e33b36d9
+  metadata.gz: 528eba213321f9c767241e0ffee5473393d6b0ee7c2ac47ef3497b33e9e55037e830c15bc480f9433849a66fac832598a4a298ae5e7a23e607c4d802251a596b
+  data.tar.gz: b36855cd3a21be372e7d65cccec9b6a2cd4cfcf8ff3892baa776ee556f2abd0f647e3d1b05251c3a6f091572270e252cfba6e02b7467e418c971a307af62262d

data/Readme.md

@@ -103,6 +103,15 @@ It's kinda like a JSON version of the Logstash config language:
       "memory_limit": 2000000, // Bytes
       "memory_limit_interval": 5, // Seconds
 
+      // Logger settings: https://github.com/sczizzo/slog
+      "slog": {
+        "timestamp_field": "timestamp",
+        "timestamp_format": "%Y-%m-%dT%H:%M:%S.%L%z",
+        "message_field": "event",
+        "shift_age": 7,
+        "shift_size": 1048576
+      },
+
       // All input configs are files by convention
       "input": {
         "configs": [

data/VERSION

@@ -1 +1 @@
-1.6.8
+1.6.9

data/bin/franz

@@ -50,9 +50,11 @@ 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, \
-  colorize: colorize, prettify: prettify
+logger = Slog.new (config[:slog] || {}).merge \
+  out: opts[:log] || $stdout,
+  colorize: colorize,
+  prettify: prettify,
+  level: level
 
 # In Franz, all queues are bounded
 io_bound = config[:output][:bound] || 10_000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slog