fluent-plugin-concat 2.2.0 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/fluent-plugin-concat.gemspec +2 -2
  4. data/lib/fluent/plugin/filter_concat.rb +4 -0
  5. metadata +8 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 924dbefdf8b877e70cece4be8eb1386781c5e83b673c50b79a2888661ad7b81b
4
- data.tar.gz: 4f441723887e4db4af2a9c5d97003d2fa005b1675b2bd99eff2957252cb809c0
3
+ metadata.gz: 7b9554bd1483439c3202f8372c5a0c1699446eb6880e386f938569c509705c86
4
+ data.tar.gz: 717f110778d3f834a4c026816ddb9932b97968604ede88f1ab939b4293289b6f
5
5
  SHA512:
6
- metadata.gz: '06209f9201a4fd1d77cfcf9d915bf2f61a8e41b7585616e8b26016769cf47330adcda04449b227c84b9add2e41c3ada9fb0a452a31ba8c22b9ed68b803ad001b'
7
- data.tar.gz: e851318a7d25722148975290967d770f82c1ae43bb1c76ad31c6f182eda69fc465d653fb6383b937c7c453d065e0e099ab6a20f652b0f9223fa9785c12b21065
6
+ metadata.gz: 5b84e5ebd5d8d071f3743194e80444dffbcd6737944e88a9d562d682127b7c243610dc10ea5b4c05d6cc9daed63e7cf5ffc439a7e24ea819f2565f642a783849
7
+ data.tar.gz: d31210d2cfbe92f7d3489b46d5569524722e0124f247548264edb87694b0dd7d114d321db331e87288f2846e7e0b2baa99c11d9d20e2dbbec97bf9710233eeba
data/README.md CHANGED
@@ -133,7 +133,7 @@ Handle single line JSON from Docker containers.
133
133
  <filter **>
134
134
  @type concat
135
135
  key message
136
- multiline_end_regexp /\\n$/
136
+ multiline_end_regexp /\n$/
137
137
  </filter>
138
138
  ```
139
139
 
data/fluent-plugin-concat.gemspec CHANGED
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = "fluent-plugin-concat"
7
- spec.version = "2.2.0"
7
+ spec.version = "2.2.1"
8
8
  spec.authors = ["Kenji Okimoto"]
9
9
  spec.email = ["okimoto@clear-code.com"]
10
10
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
16
16
  spec.files = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
17
17
  spec.require_paths = ["lib"]
18
18
 
19
- spec.add_runtime_dependency "fluentd", ">= 0.14.0"
19
+ spec.add_runtime_dependency "fluentd", ">= 0.14.0", "< 2"
20
20
  spec.add_development_dependency "bundler", "~> 1.11"
21
21
  spec.add_development_dependency "rake", "~> 12.0"
22
22
  spec.add_development_dependency "test-unit", ">= 3.1.0"
data/lib/fluent/plugin/filter_concat.rb CHANGED
@@ -84,6 +84,10 @@ module Fluent::Plugin
84
84
  new_es.add(time, record)
85
85
  next
86
86
  end
87
+ unless record.key?(@key)
88
+ new_es.add(time, record)
89
+ next
90
+ end
87
91
  begin
88
92
  flushed_es = process(tag, time, record)
89
93
  unless flushed_es.empty?
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-concat
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kenji Okimoto
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-02-01 00:00:00.000000000 Z
11
+ date: 2018-04-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fluentd
@@ -17,6 +17,9 @@ dependencies:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.14.0
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: '2'
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
24
27
  - - ">="
25
28
  - !ruby/object:Gem::Version
26
29
  version: 0.14.0
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '2'
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: bundler
29
35
  requirement: !ruby/object:Gem::Requirement