franz 2.1.9 → 2.1.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/Readme.md +3 -0
  3. data/VERSION +1 -1
  4. data/lib/franz/agg.rb +10 -2
  5. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 57ec3c8168602750bc3d92b7fb85b3726e8ee388
4
- data.tar.gz: 37a3fcd07aadd473385364afb214dc69a3221fa4
3
+ metadata.gz: 08881d15832d772d150ae2e68e35a752d0a03a81
4
+ data.tar.gz: 4bc6e2718660fa664b25f31466a096492b05f5ba
5
5
  SHA512:
6
- metadata.gz: 5ae213ef7b324adf8a1fe4047569bbe4e567118eaa84bcee7a712d734f7002ff626ab3f93b7a086c64833c10b1110940af3cff08810fedf10f75b93fc2e8cc0d
7
- data.tar.gz: cdb3ef21b32939fff9b9695c814f7154aa01d5e0ed487c7c584b709b1767694e4c335be453c9a51f5f3285231e136bdf2e59ee49fe60e3ec91f6805e3a159bff
6
+ metadata.gz: 3d26e1ffc8fa5d4be31ce59dd8b2f874eeb433e0cf02a8f1b677f870734053df491f9bdc5d15c98e0d2a3bf58f52922199eddca64deb0f28b790f81510696ad0
7
+ data.tar.gz: a5a75025f74a8995c574cd3198ef12763d38d627596be5efc847bfc7b20c39c8606a28af8c5444bd2a9d82a19704427df255d475b8a84efc043837d8cb09f437
data/Readme.md CHANGED
@@ -230,12 +230,15 @@ for Chef.
230
230
  - 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)
231
231
  - Dockerization using self-contained Linux package [available on the Docker Hub](https://registry.hub.docker.com/u/sczizzo/franz)
232
232
  - Running Franz without arguments now prints help text (i.e. `--config` is now required)
233
+ - Don't watch files from previous executions unless there's a relevant configuration
233
234
  - Rename `StdOut` to `Device`, no longer experimental
234
235
  - Allow single state file if no glob is used
235
236
  - Add autoreconnect logic to `Kafka` output
237
+ - Capture errors when parsing structured logs
236
238
  - Handle `EACCESS` on `IO.read` gracefully
237
239
  - New `HTTP` output (experimental)
238
240
  - Remove default line limit
241
+ - Allow minimal configs
239
242
 
240
243
  #### v2.0
241
244
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.9
1
+ 2.1.10
data/lib/franz/agg.rb CHANGED
@@ -124,11 +124,19 @@ module Franz
124
124
  event = { type: t, host: @@host, path: path, '@seq' => s }
125
125
 
126
126
  if @ic.json? path
127
- return if m =~ /^#/
128
- event.merge! JSON::parse(m)
127
+ begin
128
+ event.merge! JSON::parse(m)
129
+ rescue JSON::ParserError
130
+ log.error \
131
+ event: 'json parse failed',
132
+ file: path,
133
+ message: m
134
+ event.merge! message: m, _err: 'json parse failed'
135
+ end
129
136
  else
130
137
  event.merge! message: m
131
138
  end
139
+
132
140
  agg_events.push event
133
141
  end
134
142
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: franz
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.9
4
+ version: 2.1.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Clemmer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-15 00:00:00.000000000 Z
11
+ date: 2015-08-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: slog
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
174
174
  version: '0'
175
175
  requirements: []
176
176
  rubyforge_project:
177
- rubygems_version: 2.4.5
177
+ rubygems_version: 2.4.5.1
178
178
  signing_key:
179
179
  specification_version: 4
180
180
  summary: Aggregate log file events and send them elsewhere