fluent-plugin-s3 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a53266d6e18f131684aa46dec457c99ca4978cb
-  data.tar.gz: ac0d869dc9b8ac27bb9a87672766dcf245e67248
+  metadata.gz: 2947d18c7fd9a423b705a20edf99259b3148ac7b
+  data.tar.gz: 0e7aa9af1136d1c0fbfceabc16b60d17b115b238
 SHA512:
-  metadata.gz: 699badd3905de4fcd736c9456d8028ba56e5fb1d55352093370678405c9320f4a5f3ceac1e781a2d6e562bbd1c4b230cd43d758f83fcfec7d9cc6a33ec8d0f9c
-  data.tar.gz: de5513f584b237dc4cb6b01f9ec436a61718da69f7afb4a431fd04df0ae708c609b02d2b087a2d829060380562ddd51df45d5a4ca43dced56dd0f44f2133ca66
+  metadata.gz: e143162860517f33da9c276639563bd072d2b8b49d7c57d86bb7fd5352bad59550d7aa5e376fe04a7d06a34abe13afecb1c5a15932a2958397c79546d15b392c
+  data.tar.gz: e65a3ceeb9f5be37153f78fabf5b406a557c243f3134ede26f9cc219da32e98f7c8e094eb80b2ee73e49c710e6d35c795773426cd7b694a7466f4eec9f61b358

data/ChangeLog

@@ -1,3 +1,10 @@
+Release 0.4.1 - 2014/10/16
+
+  * Add 's3_region' option to specify S3 region
+  * Restrict aws-sdk gem dependency version to use v1
+  * Fix infinite loop when same object path is generated
+
+
 Release 0.4.0 - 2014/06/06
 
   * Add 'format' option to change one line format

data/README.rdoc

@@ -37,6 +37,8 @@ Simply use RubyGems:
 
 [s3_bucket (required)] S3 bucket name.
 
+[s3_region] s3 region name. For example, US West (Oregon) Region is "us-west-2". The full list of regions are available here. > http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region. We recommend using `s3_region` instead of `s3_endpoint`.
+
 [s3_endpoint] s3 endpoint name. For example, US West (Oregon) Region is "s3-us-west-2.amazonaws.com". The full list of endpoints are available here. > http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
 
 [s3_object_key_format] The format of S3 object keys. You can use several built-in variables:

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/fluent-plugin-s3.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "fluentd", "~> 0.10.49"
-  gem.add_dependency "aws-sdk", ">= 1.8.2"
+  gem.add_dependency "aws-sdk", "~> 1.38"
   gem.add_dependency "yajl-ruby", "~> 1.0"
   gem.add_dependency "fluent-mixin-config-placeholders", "~> 0.2.0"
   gem.add_development_dependency "rake", ">= 0.9.2"

data/lib/fluent/plugin/out_s3.rb

@@ -24,6 +24,7 @@ module Fluent
     config_param :aws_key_id, :string, :default => nil
     config_param :aws_sec_key, :string, :default => nil
     config_param :s3_bucket, :string
+    config_param :s3_region, :string, :default => nil
     config_param :s3_endpoint, :string, :default => nil
     config_param :s3_object_key_format, :string, :default => "%{path}%{time_slice}_%{index}.%{file_extension}"
     config_param :store_as, :string, :default => "gzip"
@@ -99,7 +100,8 @@ module Fluent
         options[:access_key_id] = @aws_key_id
         options[:secret_access_key] = @aws_sec_key
       end
-      options[:s3_endpoint] = @s3_endpoint if @s3_endpoint
+      options[:region] = @s3_region if @s3_region
+      options[:endpoint] = @s3_endpoint if @s3_endpoint
       options[:proxy_uri] = @proxy_uri if @proxy_uri
       options[:use_ssl] = @use_ssl
 
@@ -116,6 +118,7 @@ module Fluent
 
     def write(chunk)
       i = 0
+      previous_path = nil
 
       begin
         path = @path_slicer.call(@path)
@@ -128,7 +131,12 @@ module Fluent
         s3path = @s3_object_key_format.gsub(%r(%{[^}]+})) { |expr|
           values_for_s3_object_key[expr[2...expr.size-1]]
         }
+        if (i > 0) && (s3path == previous_path)
+          raise "duplicated path is generated. use %{index} in s3_object_key_format: path = #{s3path}"
+        end
+
         i += 1
+        previous_path = s3path
       end while @bucket.objects[s3path].exists?
 
       tmp = Tempfile.new("s3-")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -29,16 +29,16 @@ dependencies:
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement