fluent-plugin-s3 1.0.0.rc6 → 1.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd861e069bcd31f8ad2706fc50c1092f5af8dcb
-  data.tar.gz: 1f81371995e0055d970588c90ee4935cfbfde130
+  metadata.gz: a9004ff4bae66456aef22c473fc4c3ec84605550
+  data.tar.gz: 0542d73f21a39bda4c57ec89d72b17f48b8a7d54
 SHA512:
-  metadata.gz: 98d38a22b4c2dda74f9cfc16563fab382734e86b46e8a7571c89e38602b3ef45620e566feb9344faae77ff3cc1fd4ef19ad022105483db80a7fcf2545942ee80
-  data.tar.gz: 6912ead0e0351b6cae5bcdd4f92661c6a15221cb26056c508e466eb1cd8dee0b546e65bfb9e4fb51aebeeb60271fc0d0feaa6c69327e858cb7ec8660953369d7
+  metadata.gz: 6b7854777efd1ca785af9ccb2cf3fe02da3dd854ef6a4df0d9fc7d924efedb566f924841c6b7f21ba68fb20f637ad8c87b6d79356027d1567e998df19a30f801
+  data.tar.gz: f81bee6a69a7bf90ba8527018319e2e14a635460fae602e9588d67037a67bfd4f2475d6c51f7429a71052c444fe84f14475ff60da3ec230b7ad177c7c93945b0

data/VERSION

@@ -1 +1 @@
-1.0.0.rc6
+1.0.0.rc7

data/lib/fluent/plugin/out_s3.rb

@@ -160,6 +160,15 @@ module Fluent::Plugin
       end
 
       @s3_object_key_format = process_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
+
       # For backward compatibility
       # TODO: Remove time_slice_format when end of support compat_parameters
       @configured_time_slice_format = conf['time_slice_format']
@@ -192,10 +201,6 @@ module Fluent::Plugin
       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
 
@@ -253,7 +258,7 @@ module Fluent::Plugin
         }
         values_for_s3_object_key = {
           "%{path}" => @path,
-          "%{time_slice}" => time_slice,
+          "%{date_slice}" => time_slice,
           "%{file_extension}" => @compressor.ext,
           "%{hms_slice}" => hms_slicer,
         }.merge!(@values_for_s3_object_chunk[chunk.unique_id])
@@ -268,7 +273,7 @@ module Fluent::Plugin
       begin
         @compressor.compress(chunk, tmp)
         tmp.rewind
-        log.debug { "out_s3: write chunk: {key:#{chunk.key},tsuffix:#{tsuffix(chunk)}} to s3://#{@s3_bucket}/#{s3path}" }
+        log.debug "out_s3: write chunk with metadata #{chunk.metadata} to s3://#{@s3_bucket}/#{s3path}"
 
         put_options = {
           body: tmp,
@@ -294,7 +299,7 @@ module Fluent::Plugin
 
         if @warn_for_delay
           if Time.at(chunk.metadata.timekey) < Time.now - @warn_for_delay
-            log.warn { "out_s3: delayed events were put to s3://#{@s3_bucket}/#{s3path}" }
+            log.warn "out_s3: delayed events were put to s3://#{@s3_bucket}/#{s3path}"
           end
         end
       ensure

metadata

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