fluent-plugin-s3 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7338db1eaf442db639f0e6fbfb1756b048c943bf
4
- data.tar.gz: 2b335117637daa95f7428b2d48984e7ca54874a8
3
+ metadata.gz: 29ae6edc5711fd7c6409cdcf3f592db33f50cf2c
4
+ data.tar.gz: 00b0445936e92e75346e4e9fd2f3b1943031349c
5
5
  SHA512:
6
- metadata.gz: e35a7293b090d1e2559f246b1782c953f332e63e6bcb1bd3fcf47e563cc80f29f6db280234f909b728e961126d8877e8b6f33dc2178361dc42641013c0799cb3
7
- data.tar.gz: 7b3f913815dc931d4bf1f09e536e42b3038080c2974396abc973c00bdf70a0845910e6da166f556731668ef5ca83915a36f9bc4504634486f00196bda3904072
6
+ metadata.gz: 9c4d1b1d4d344cc1360db807f46512a39a203843b0a5735086814bea80b0a3940c2f50ac98f15f1c30016537d0c53e6d5589211b310b3fe1a6d9bff498445bff
7
+ data.tar.gz: a4f94d231b9c0d9aef6eaee2f03aa7a75f95a88dced554731bd0b5cfabf5229063220d601317eb9d12cc18c9541a12a4b50cce53e4d902205b93d0b9ebe26e88
@@ -2,9 +2,10 @@ language: ruby
2
2
 
3
3
  rvm:
4
4
  - 2.1.10
5
- - 2.2.5
6
- - 2.3.1
7
- - 2.4.0
5
+ - 2.2.9
6
+ - 2.3.6
7
+ - 2.4.3
8
+ - 2.5.0
8
9
  - ruby-head
9
10
 
10
11
  gemfile:
data/ChangeLog CHANGED
@@ -1,3 +1,7 @@
1
+ Release 1.1.2 - 2018/04/10
2
+
3
+ * out_s3: Fix memory leak when s3_object_key_format has time related placeholder
4
+
1
5
  Release 1.1.1 - 2018/01/10
2
6
 
3
7
  * out_s3: Add index_format parameter
data/README.md CHANGED
@@ -30,20 +30,18 @@ We must setup SQS queue and S3 event notification before use this plugin.
30
30
  | >= 1.0.0 | >= v0.14.0 | >= 2.1 |
31
31
  | < 1.0.0 | >= v0.12.0 | >= 1.9 |
32
32
 
33
- NOTE: fluent-plugin-s3 v1.0.0 is now RC. We will release stable v1.0.0 soon.
34
-
35
33
  ## Installation
36
34
 
37
35
  Simply use RubyGems:
38
36
 
39
- $ gem install fluent-plugin-s3 -v "~> 0.8" --no-document # for fluentd v0.12 or later
40
- $ gem install fluent-plugin-s3 -v 1.0.0.rc2 --no-document # for fluentd v0.14 or later
37
+ $ gem install fluent-plugin-s3 -v "~> 0.8" --no-document # for fluentd v0.12 or later
38
+ $ gem install fluent-plugin-s3 -v 1.0.0 --no-document # for fluentd v1.0 or later
41
39
 
42
40
  ## Output: Configuration
43
41
 
44
- ### v0.14 style
42
+ ### v1.0 style
45
43
 
46
- With fluentd v0.14 and fluent-plugin-s3 v1.0.0, use new buffer configuration to dynamic parameters.
44
+ With fluentd v1.0 and fluent-plugin-s3 v1.0.0, use new buffer configuration to dynamic parameters.
47
45
 
48
46
  <match pattern>
49
47
  @type s3
@@ -77,13 +75,13 @@ For `<buffer>`, you can use any record field in `path` / `s3_object_key_format`.
77
75
  # parameters...
78
76
  </buffer>
79
77
 
80
- See official article for more detail: [Buffer section configurations](http://docs.fluentd.org/v0.14/articles/buffer-section)
78
+ See official article for more detail: [Buffer section configurations](http://docs.fluentd.org/v1.0/articles/buffer-section)
81
79
 
82
80
  Note that this configuration doesn't work with fluentd v0.12.
83
81
 
84
82
  ### v0.12 style
85
83
 
86
- This configuration works with both fluentd v0.12 and v0.14.
84
+ This configuration works with both fluentd v0.12 and v1.0.
87
85
 
88
86
  <match pattern>
89
87
  @type s3
@@ -137,6 +135,14 @@ recommend using `s3_region` instead of `s3_endpoint`.
137
135
  endpoint for S3 compatible services. For example, Riak CS based storage or
138
136
  something. This option doesn't work on S3, use `s3_region` instead.
139
137
 
138
+ **use_bundled_cert**
139
+
140
+ For cases where the default SSL certificate is unavailable (e.g. Windows), you can set this option to true in order to use the AWS SDK bundled certificate. Default is false.
141
+
142
+ This fixes the following error often seen in Windows:
143
+
144
+ SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed (Seahorse::Client::NetworkingError)
145
+
140
146
  **ssl_verify_peer**
141
147
 
142
148
  Verify SSL certificate of the endpoint. Default is true. Set false when you want to ignore the endpoint SSL certificate.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.1
1
+ 1.1.2
@@ -238,16 +238,21 @@ module Fluent::Plugin
238
238
  @values_for_s3_object_chunk[chunk.unique_id] ||= {
239
239
  "%{hex_random}" => hex_random(chunk),
240
240
  }
241
- values_for_s3_object_key = {
241
+ values_for_s3_object_key_pre = {
242
242
  "%{path}" => @path,
243
- "%{time_slice}" => time_slice,
244
243
  "%{file_extension}" => @compressor.ext,
244
+ }
245
+ values_for_s3_object_key_post = {
246
+ "%{time_slice}" => time_slice,
245
247
  "%{index}" => sprintf(@index_format,i),
246
248
  }.merge!(@values_for_s3_object_chunk[chunk.unique_id])
247
- values_for_s3_object_key["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
249
+ values_for_s3_object_key_post["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
248
250
 
249
- s3path = @s3_object_key_format.gsub(%r(%{[^}]+}), values_for_s3_object_key)
251
+ s3path = @s3_object_key_format.gsub(%r(%{[^}]+})) do |matched_key|
252
+ values_for_s3_object_key_pre.fetch(matched_key, matched_key)
253
+ end
250
254
  s3path = extract_placeholders(s3path, metadata)
255
+ s3path = s3path.gsub(%r(%{[^}]+}), values_for_s3_object_key_post)
251
256
  if (i > 0) && (s3path == previous_path)
252
257
  if @overwrite
253
258
  log.warn "#{s3path} already exists, but will overwrite"
@@ -270,16 +275,21 @@ module Fluent::Plugin
270
275
  @values_for_s3_object_chunk[chunk.unique_id] ||= {
271
276
  "%{hex_random}" => hex_random(chunk),
272
277
  }
273
- values_for_s3_object_key = {
278
+ values_for_s3_object_key_pre = {
274
279
  "%{path}" => @path,
275
- "%{date_slice}" => time_slice,
276
280
  "%{file_extension}" => @compressor.ext,
281
+ }
282
+ values_for_s3_object_key_post = {
283
+ "%{date_slice}" => time_slice,
277
284
  "%{hms_slice}" => hms_slicer,
278
285
  }.merge!(@values_for_s3_object_chunk[chunk.unique_id])
279
- values_for_s3_object_key["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
286
+ values_for_s3_object_key_post["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
280
287
 
281
- s3path = @s3_object_key_format.gsub(%r(%{[^}]+}), values_for_s3_object_key)
288
+ s3path = @s3_object_key_format.gsub(%r(%{[^}]+})) do |matched_key|
289
+ values_for_s3_object_key_pre.fetch(matched_key, matched_key)
290
+ end
282
291
  s3path = extract_placeholders(s3path, metadata)
292
+ s3path = s3path.gsub(%r(%{[^}]+}), values_for_s3_object_key_post)
283
293
  end
284
294
 
285
295
  tmp = Tempfile.new("s3-")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-s3
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-01-10 00:00:00.000000000 Z
12
+ date: 2018-04-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: fluentd