fluent-plugin-s3 0.2.5 → 0.2.6

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.2.6 - 2012/01/15
+
+  * Add use_ssl option
+
 
 Release 0.2.5 - 2012/12/06
 
@@ -18,7 +22,7 @@ Release 0.2.3 - 2012/11/19
 
 Release 0.2.2 - 2011/12/15
 
-  * Add s3_endpoint optio
+  * Add s3_endpoint option
 
 
 Release 0.2.1 - 2011/10/24

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/fluent/plugin/out_s3.rb

@@ -10,6 +10,8 @@ class S3Output < Fluent::TimeSlicedOutput
     require 'zlib'
     require 'time'
     require 'tempfile'
+
+    @use_ssl = true
   end
 
   config_param :path, :string, :default => ""
@@ -35,6 +37,17 @@ class S3Output < Fluent::TimeSlicedOutput
       @format_json = false
     end
 
+    if use_ssl = conf['use_ssl']
+      if use_ssl.empty?
+        @use_ssl = true
+      else
+        @use_ssl = Config.bool_value(use_ssl)
+        if @use_ssl.nil?
+          raise ConfigError, "'true' or 'false' is required for use_ssl option on s3 output"
+        end
+      end
+    end
+
     @timef = TimeFormatter.new(@time_format, @localtime)
   end
 
@@ -46,6 +59,8 @@ class S3Output < Fluent::TimeSlicedOutput
       options[:secret_access_key] = @aws_sec_key
     end
     options[:s3_endpoint] = @s3_endpoint if @s3_endpoint
+    options[:use_ssl] = @use_ssl
+
     @s3 = AWS::S3.new(options)
     @bucket = @s3.buckets[@s3_bucket]
   end

data/test/out_s3.rb

@@ -29,6 +29,7 @@ class S3OutputTest < Test::Unit::TestCase
     assert_equal 'test_sec_key', d.instance.aws_sec_key
     assert_equal 'test_bucket', d.instance.s3_bucket
     assert_equal 'log', d.instance.path
+    assert d.instance.instance_variable_get(:@use_ssl)
   end
 
   def test_format

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -102,12 +102,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -957364254525035982
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -957364254525035982
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -116,4 +122,3 @@ specification_version: 3
 summary: Amazon S3 output plugin for Fluent event collector
 test_files:
 - test/out_s3.rb
-has_rdoc: false