fluent-plugin-s3 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df85fb4977d84a85925b04c8ae08a04f4864ed28
-  data.tar.gz: f66abd428acd9da5642939f6ed37a1d888f793aa
+  metadata.gz: 17add9c31857c6ce80237346cd1d1c9b04228c42
+  data.tar.gz: 8fc1df453d0a0ba8c2cee043c8ed5de2082ab12a
 SHA512:
-  metadata.gz: 806553c25324c89e7add78e39ec695bec12f4ca5fd74e8900e115775dee509d02cdf4e3e7ff26bd15b4c56dc71c968ab5360af24d1f3eb3607b81d3390dc656e
-  data.tar.gz: f29eea5549311a8522fb98dbf2e04ceb9803d7bd9056e50633bf24757eb6eaeaa150ed0772d26deb14daeba14ae40f97ae85162fb6e28fbd92b9d9169ca92a42
+  metadata.gz: 05a92ebf96c7817dd19bbb7804e58352eb502a02387e3d78de4743a2f2725ed13c97b6c00e8956d1c7db47a112d6f54888daf6e17a365a38cdb0e65cae5237c2
+  data.tar.gz: 24a208b805572239fe1844a8218a7b96c86585bddbc8fc160ddb610cd9bb1a979f212947ca126a6ee8d4d3e5d7d99e1b4aaa43a52c29699a6913b37e9b4c9707

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.8.6 - 2017/10/11
+
+  * out_s3: specified s3_object_key_format is applied when check_object is false
+
+
 Release 0.8.5 - 2017/08/04
 
   * out_s3: Fix typo error in debug log message

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/lib/fluent/plugin/out_s3.rb

@@ -168,6 +168,14 @@ module Fluent
 
       @path = process_deprecated_placeholders(@path)
       @s3_object_key_format = process_deprecated_placeholders(@s3_object_key_format)
+      if !@check_object
+        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}"
+        end
+      end
       @values_for_s3_object_chunk = {}
     end
 
@@ -192,10 +200,6 @@ module Fluent
       check_apikeys if @check_apikey_on_start
       ensure_bucket if @check_bucket
 
-      if !@check_object
-        @s3_object_key_format = "%{path}/%{date_slice}_%{hms_slice}.%{file_extension}"
-      end
-
       super
     end
 
@@ -246,6 +250,7 @@ module Fluent
 
         values_for_s3_object_key = {
           "path" => @path_slicer.call(@path),
+          "time_slice" => chunk.key,
           "date_slice" => chunk.key,
           "file_extension" => @compressor.ext,
           "hms_slice" => hms_slicer,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd