fluent-plugin-s3 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16e7bfdfa2c8a9ac640bc5aab2f4f340ff764874
-  data.tar.gz: a4711544ff30e4312474b85a730aa00fb8cd3c1b
+SHA256:
+  metadata.gz: 164bdc30d36c459b718ba23deb8e4a2ba92e7975649f1ceac6f463080b4664e1
+  data.tar.gz: c1d226ea3a67ae5aec3bae2f76b64e61bcde12554a2132416056a97826a40dc0
 SHA512:
-  metadata.gz: d084d89f1fc8ba64405c417e2f71d5a2316d47de454be606d28b54ad9a52d567e09e401a5f1bf72268c638d37e5b17812e4c3d85be6221081c6921fe2160adc1
-  data.tar.gz: fdd479ee6b6bbae6a0d4bd2e25817d70b6f82fe2d8ab87ca835b4b803cd86f7b3432266bdd4ed099edcda8501d11d790818ed4336740f79126cc87d621c4031a
+  metadata.gz: c6d62d8f88fd09611eb5ecec1157574da96190b625f1794106f68bee4e57fb0dda317547330a0649c66f4d7224cf953e3395fb170f481b5b5a5d242eb318c69a
+  data.tar.gz: 031dac994ab6a51424114077e8ae0006617953c44de05f75a3035b6c0de2ff3b67f16c6f706e6ab658cf6fd99a623e8d7d30ceceaef74d2678556d99be824868

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 1.1.4 - 2018/07/22
+
+  * out_s3: Support time_slice in `check_object false`. date_slice is kept for backward compatibility
+
 Release 1.1.3 - 2018/04/15
 
   * in_s3: Fixed extracting gzip's multiple stream.

data/README.md

@@ -299,8 +299,8 @@ When it is false,
 Check object before creation if it exists or not. Default is true.
 
 When it is false,
-	s3_object_key_format will be %{path}%{date_slice}_%{time_slice}.%{file_extension}
-	where, time_slice will be in hhmmss format, so that each object will be unique.
+	s3_object_key_format will be %{path}%{time_slice}_%{hms_slice}.%{file_extension} by default
+	where, hms_slice will be time-slice in hhmmss format, so that each object will be unique.
 	Example object name, assuming it is created on 2016/16/11 3:30:54 PM
 		20161611_153054.txt (extension can be anything as per user's choice)
 
@@ -696,7 +696,7 @@ on EC2 instances.
 
 ## Use your (de)compression algorithm
 
-s3 plugin has plugabble compression mechanizm like Fleuntd's input / output
+s3 plugin has pluggable compression mechanizm like Fluentd's input / output
 plugin. If you set 'store_as xxx', `out_s3` plugin searches
 `fluent/plugin/s3_compressor_xxx.rb` and `in_s3` plugin searches
 `fluent/plugin/s3_extractor_xxx.rb`. You can define your (de)compression with

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/fluent/plugin/out_s3.rb

@@ -178,8 +178,8 @@ module Fluent::Plugin
         if conf.has_key?('s3_object_key_format')
           log.warn "Set 'check_object false' and s3_object_key_format is specified. Check s3_object_key_format is unique in each write. If not, existing file will be overwritten."
         else
-          log.warn "Set 'check_object false' and s3_object_key_format is not specified. Use '%{path}/%{date_slice}_%{hms_slice}.%{file_extension}' for s3_object_key_format"
-          @s3_object_key_format = "%{path}/%{date_slice}_%{hms_slice}.%{file_extension}"
+          log.warn "Set 'check_object false' and s3_object_key_format is not specified. Use '%{path}/%{time_slice}_%{hms_slice}.%{file_extension}' for s3_object_key_format"
+          @s3_object_key_format = "%{path}/%{time_slice}_%{hms_slice}.%{file_extension}"
         end
       end
 
@@ -280,7 +280,8 @@ module Fluent::Plugin
           "%{file_extension}" => @compressor.ext,
         }
         values_for_s3_object_key_post = {
-          "%{date_slice}" => time_slice,
+          "%{date_slice}" => time_slice,  # For backward compatibility
+          "%{time_slice}" => time_slice,
           "%{hms_slice}" => hms_slicer,
         }.merge!(@values_for_s3_object_chunk[chunk.unique_id])
         values_for_s3_object_key_post["%{uuid_flush}".freeze] = uuid_random if @uuid_flush_enabled

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Amazon S3 output plugin for Fluentd event collector