franz 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57ec3c8168602750bc3d92b7fb85b3726e8ee388
-  data.tar.gz: 37a3fcd07aadd473385364afb214dc69a3221fa4
+  metadata.gz: 08881d15832d772d150ae2e68e35a752d0a03a81
+  data.tar.gz: 4bc6e2718660fa664b25f31466a096492b05f5ba
 SHA512:
-  metadata.gz: 5ae213ef7b324adf8a1fe4047569bbe4e567118eaa84bcee7a712d734f7002ff626ab3f93b7a086c64833c10b1110940af3cff08810fedf10f75b93fc2e8cc0d
-  data.tar.gz: cdb3ef21b32939fff9b9695c814f7154aa01d5e0ed487c7c584b709b1767694e4c335be453c9a51f5f3285231e136bdf2e59ee49fe60e3ec91f6805e3a159bff
+  metadata.gz: 3d26e1ffc8fa5d4be31ce59dd8b2f874eeb433e0cf02a8f1b677f870734053df491f9bdc5d15c98e0d2a3bf58f52922199eddca64deb0f28b790f81510696ad0
+  data.tar.gz: a5a75025f74a8995c574cd3198ef12763d38d627596be5efc847bfc7b20c39c8606a28af8c5444bd2a9d82a19704427df255d475b8a84efc043837d8cb09f437

data/Readme.md

@@ -230,12 +230,15 @@ for Chef.
 - 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)
 - Dockerization using self-contained Linux package [available on the Docker Hub](https://registry.hub.docker.com/u/sczizzo/franz)
 - Running Franz without arguments now prints help text (i.e. `--config` is now required)
+- Don't watch files from previous executions unless there's a relevant configuration
 - Rename `StdOut` to `Device`, no longer experimental
 - Allow single state file if no glob is used
 - Add autoreconnect logic to `Kafka` output
+- Capture errors when parsing structured logs
 - Handle `EACCESS` on `IO.read` gracefully
 - New `HTTP` output (experimental)
 - Remove default line limit
+- Allow minimal configs
 
 #### v2.0
 

data/VERSION

@@ -1 +1 @@
-2.1.9
+2.1.10

data/lib/franz/agg.rb

@@ -124,11 +124,19 @@ module Franz
       event = { type: t, host: @@host, path: path, '@seq' => s }
 
       if @ic.json? path
-        return if m =~ /^#/
-        event.merge! JSON::parse(m)
+        begin
+          event.merge! JSON::parse(m)
+        rescue JSON::ParserError
+          log.error \
+            event: 'json parse failed',
+            file: path,
+            message: m
+          event.merge! message: m, _err: 'json parse failed'
+        end
       else
         event.merge! message: m
       end
+
       agg_events.push event
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slog
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Aggregate log file events and send them elsewhere