fluent-plugin-s3 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7338db1eaf442db639f0e6fbfb1756b048c943bf
-  data.tar.gz: 2b335117637daa95f7428b2d48984e7ca54874a8
+  metadata.gz: 29ae6edc5711fd7c6409cdcf3f592db33f50cf2c
+  data.tar.gz: 00b0445936e92e75346e4e9fd2f3b1943031349c
 SHA512:
-  metadata.gz: e35a7293b090d1e2559f246b1782c953f332e63e6bcb1bd3fcf47e563cc80f29f6db280234f909b728e961126d8877e8b6f33dc2178361dc42641013c0799cb3
-  data.tar.gz: 7b3f913815dc931d4bf1f09e536e42b3038080c2974396abc973c00bdf70a0845910e6da166f556731668ef5ca83915a36f9bc4504634486f00196bda3904072
+  metadata.gz: 9c4d1b1d4d344cc1360db807f46512a39a203843b0a5735086814bea80b0a3940c2f50ac98f15f1c30016537d0c53e6d5589211b310b3fe1a6d9bff498445bff
+  data.tar.gz: a4f94d231b9c0d9aef6eaee2f03aa7a75f95a88dced554731bd0b5cfabf5229063220d601317eb9d12cc18c9541a12a4b50cce53e4d902205b93d0b9ebe26e88

data/.travis.yml

@@ -2,9 +2,10 @@ language: ruby
 
 rvm:
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.0
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
 
 gemfile:

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 1.1.2 - 2018/04/10
+
+  * out_s3: Fix memory leak when s3_object_key_format has time related placeholder
+
 Release 1.1.1 - 2018/01/10
 
   * out_s3: Add index_format parameter

data/README.md

@@ -30,20 +30,18 @@ We must setup SQS queue and S3 event notification before use this plugin.
 | >= 1.0.0 | >= v0.14.0 | >= 2.1 |
 |  < 1.0.0 | >= v0.12.0 | >= 1.9 |
 
-NOTE: fluent-plugin-s3 v1.0.0 is now RC. We will release stable v1.0.0 soon.
-
 ## Installation
 
 Simply use RubyGems:
 
-    $ gem install fluent-plugin-s3 -v "~> 0.8"  --no-document # for fluentd v0.12 or later
-    $ gem install fluent-plugin-s3 -v 1.0.0.rc2 --no-document # for fluentd v0.14 or later
+    $ gem install fluent-plugin-s3 -v "~> 0.8" --no-document # for fluentd v0.12 or later
+    $ gem install fluent-plugin-s3 -v 1.0.0 --no-document # for fluentd v1.0 or later
 
 ## Output: Configuration
 
-### v0.14 style
+### v1.0 style
 
-With fluentd v0.14 and fluent-plugin-s3 v1.0.0, use new buffer configuration to dynamic parameters.
+With fluentd v1.0 and fluent-plugin-s3 v1.0.0, use new buffer configuration to dynamic parameters.
 
     <match pattern>
       @type s3
@@ -77,13 +75,13 @@ For `<buffer>`, you can use any record field in `path` / `s3_object_key_format`.
       # parameters...
     </buffer>
 
-See official article for more detail: [Buffer section configurations](http://docs.fluentd.org/v0.14/articles/buffer-section)
+See official article for more detail: [Buffer section configurations](http://docs.fluentd.org/v1.0/articles/buffer-section)
 
 Note that this configuration doesn't work with fluentd v0.12.
 
 ### v0.12 style
 
-This configuration works with both fluentd v0.12 and v0.14.
+This configuration works with both fluentd v0.12 and v1.0.
 
     <match pattern>
       @type s3
@@ -137,6 +135,14 @@ recommend using `s3_region` instead of `s3_endpoint`.
 endpoint for S3 compatible services. For example, Riak CS based storage or
 something. This option doesn't work on S3, use `s3_region` instead.
 
+**use_bundled_cert**
+
+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.
+
+This fixes the following error often seen in Windows:
+
+    SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed (Seahorse::Client::NetworkingError)
+
 **ssl_verify_peer**
 
 Verify SSL certificate of the endpoint. Default is true. Set false when you want to ignore the endpoint SSL certificate.

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/fluent/plugin/out_s3.rb

@@ -238,16 +238,21 @@ module Fluent::Plugin
           @values_for_s3_object_chunk[chunk.unique_id] ||= {
             "%{hex_random}" => hex_random(chunk),
           }
-          values_for_s3_object_key = {
+          values_for_s3_object_key_pre = {
             "%{path}" => @path,
-            "%{time_slice}" => time_slice,
             "%{file_extension}" => @compressor.ext,
+          }
+          values_for_s3_object_key_post = {
+            "%{time_slice}" => time_slice,
             "%{index}" => sprintf(@index_format,i),
           }.merge!(@values_for_s3_object_chunk[chunk.unique_id])
-          values_for_s3_object_key["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
+          values_for_s3_object_key_post["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
 
-          s3path = @s3_object_key_format.gsub(%r(%{[^}]+}), values_for_s3_object_key)
+          s3path = @s3_object_key_format.gsub(%r(%{[^}]+})) do |matched_key|
+            values_for_s3_object_key_pre.fetch(matched_key, matched_key)
+          end
           s3path = extract_placeholders(s3path, metadata)
+          s3path = s3path.gsub(%r(%{[^}]+}), values_for_s3_object_key_post)
           if (i > 0) && (s3path == previous_path)
             if @overwrite
               log.warn "#{s3path} already exists, but will overwrite"
@@ -270,16 +275,21 @@ module Fluent::Plugin
         @values_for_s3_object_chunk[chunk.unique_id] ||= {
           "%{hex_random}" => hex_random(chunk),
         }
-        values_for_s3_object_key = {
+        values_for_s3_object_key_pre = {
           "%{path}" => @path,
-          "%{date_slice}" => time_slice,
           "%{file_extension}" => @compressor.ext,
+        }
+        values_for_s3_object_key_post = {
+          "%{date_slice}" => time_slice,
           "%{hms_slice}" => hms_slicer,
         }.merge!(@values_for_s3_object_chunk[chunk.unique_id])
-        values_for_s3_object_key["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
+        values_for_s3_object_key_post["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled
 
-        s3path = @s3_object_key_format.gsub(%r(%{[^}]+}), values_for_s3_object_key)
+        s3path = @s3_object_key_format.gsub(%r(%{[^}]+})) do |matched_key|
+          values_for_s3_object_key_pre.fetch(matched_key, matched_key)
+        end
         s3path = extract_placeholders(s3path, metadata)
+        s3path = s3path.gsub(%r(%{[^}]+}), values_for_s3_object_key_post)
       end
 
       tmp = Tempfile.new("s3-")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd