fluent-plugin-s3 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9d2e9c4b652b764291098f4f78295936bc061ae
-  data.tar.gz: bab3ab13e4fae1ff603197db57b86830ec22d532
+  metadata.gz: 4cc0288cd0570f9a9d1126c0902ce9c433c35cbf
+  data.tar.gz: 0e43079cda29f9319892c23e1eb5beea722dc714
 SHA512:
-  metadata.gz: 920ccb7def0e7cb1dffd101d993b89a3d8206a4d643aa81452762561f90e25905dd107e7324f531fda4b1a37b0ad54ba0b0c1a2a430c5041ac6fc6e6e5699817
-  data.tar.gz: f2ff65f0e35ce52517e32a3cef95ad1e3da873f96b9dc03fe01af65ae08fd0db5f1a424feb5920e163427743dfa38b359b659f408cda42d3a56ee25162193f9b
+  metadata.gz: e2765df3ba45b91b809b12deb008d77a83e581c71858ef26b8afb351d0d476246fb3020c9505cf39da2d508e5008a8f5e7a4ce955734144b8f31e417e877fbb3
+  data.tar.gz: c1390e6687f6b024f265776f2e4882151741b450bc1e04d7c5f0bda276a8da06ac1e0ad975785e53e181b10db79a03735c69ae71c636cb7b2af8c0517b54f9e9

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.8.2 - 2017/02/298
+
+  * Log debug message when `debug` or `trace` is set in `@log_level`
+
+
 Release 0.8.1 - 2017/01/29
 
   * out_s3: Add ssl_verify_peer option to disable cert check

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/fluent/log-ext.rb

@@ -0,0 +1,12 @@
+require 'fluent/log'
+# For Fluentd v0.14.13 or earlier
+# logger for Aws::S3::Client and Aws::SQS::Client required `#<<` method
+module Fluent
+  class Log
+    unless method_defined?(:<<)
+      def <<(message)
+        write(message)
+      end
+    end
+  end
+end

data/lib/fluent/plugin/in_s3.rb

@@ -1,4 +1,5 @@
 require 'fluent/input'
+require 'fluent/log-ext'
 
 module Fluent
   class S3Input < Input
@@ -109,6 +110,8 @@ module Fluent
       super
 
       s3_client = create_s3_client
+
+      log.debug("Succeeded to create S3 client")
       @s3 = Aws::S3::Resource.new(:client => s3_client)
       @bucket = @s3.bucket(@s3_bucket)
 
@@ -117,8 +120,10 @@ module Fluent
       check_apikeys if @check_apikey_on_start
 
       sqs_client = create_sqs_client
+      log.debug("Succeeded to create SQS client")
       response = sqs_client.get_queue_url(queue_name: @sqs.queue_name)
       sqs_queue_url = response.queue_url
+      log.debug("Succeeded to get SQS queue URL")
 
       @poller = Aws::SQS::QueuePoller.new(sqs_queue_url, client: sqs_client)
 
@@ -144,6 +149,7 @@ module Fluent
       @poller.poll(options) do |message|
         begin
           body = Yajl.load(message.body)
+          log.debug(body)
           next unless body["Records"] # skip test queue
 
           process(body)
@@ -194,6 +200,10 @@ module Fluent
       options = setup_credentials
       options[:region] = @s3_region if @s3_region
       options[:proxy_uri] = @proxy_uri if @proxy_uri
+      log.on_trace do
+        options[:http_wire_trace] = true
+        options[:logger] = log
+      end
 
       Aws::S3::Client.new(options)
     end
@@ -201,12 +211,17 @@ module Fluent
     def create_sqs_client
       options = setup_credentials
       options[:region] = @s3_region if @s3_region
+      log.on_trace do
+        options[:http_wire_trace] = true
+        options[:logger] = log
+      end
 
       Aws::SQS::Client.new(options)
     end
 
     def check_apikeys
       @bucket.objects.first
+      log.debug("Succeeded to verify API keys")
     rescue => e
       raise "can't call S3 API. Please check your aws_key_id / aws_sec_key or s3_region configuration. error = #{e.inspect}"
     end

data/lib/fluent/plugin/out_s3.rb

@@ -1,4 +1,5 @@
 require 'fluent/output'
+require 'fluent/log-ext'
 
 module Fluent
   class S3Output < Fluent::TimeSlicedOutput
@@ -177,6 +178,10 @@ module Fluent
       options[:compute_checksums] = @compute_checksums unless @compute_checksums.nil?
       options[:signature_version] = @signature_version unless @signature_version.nil?
       options[:ssl_verify_peer] = @ssl_verify_peer
+      log.on_trace do
+        options[:http_wire_trace] = true
+        options[:logger] = log
+      end
 
       s3_client = Aws::S3::Client.new(options)
       @s3 = Aws::S3::Resource.new(:client => s3_client)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -138,6 +138,7 @@ files:
 - VERSION
 - appveyor.yml
 - fluent-plugin-s3.gemspec
+- lib/fluent/log-ext.rb
 - lib/fluent/plugin/in_s3.rb
 - lib/fluent/plugin/out_s3.rb
 - lib/fluent/plugin/s3_compressor_gzip_command.rb
@@ -168,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Amazon S3 output plugin for Fluentd event collector