fluent-plugin-azurestorage-gen2 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4b4636ae463e1d010ac8b6c069c1c9e47d226a9
-  data.tar.gz: b215a1aa8a4c8c9e768b38f1ee3a318b8d5f42a2
+  metadata.gz: 830b58ff51c9166a04c91f7e4994cc5c867c86e1
+  data.tar.gz: b257f9c0684a7797266920775cea076d9c6f67dc
 SHA512:
-  metadata.gz: 8c7eb7bd110a30963f4cc5b99303829d234b9285a7a29e4b9eb3115511e0c7870f06f94cf237b60ce8cd76e74a0c634a71341747b0991b5080f7dbab2f94ec3f
-  data.tar.gz: a02576ae303d449b2d2301c88d80e076792acf58d90b50fafa4822a3ab96581f1566ccb052cd153d42a323fb4563575b648271f89a9220d815ba1a3d5f953be2
+  metadata.gz: 2512d0e061e46d7820dc6405ea2530eeceb1f65483eb9d31789df8956c4fb1469a43d20a2ebee3b0e496a73143f406331c17aabe812d9a65dae4828729d8c6aa
+  data.tar.gz: 185079c3757ccdbaf51d205984f57791b5d3e20566c65ec8adea0b94f7db6667a56074a34234543afe29e429fb205f7bc2cf681b70e8e803d0992b1db772e65d

data/README.md

@@ -9,7 +9,7 @@
 
 | fluent-plugin-azurestorage-gen2 | fluentd | ruby |
 |------------------------|---------|------|
-| >= 0.2.0 | >= v0.14.0 | >= 2.4 |
+| >= 0.1.0 | >= v0.14.0 | >= 2.4 |
 
 ## Overview
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/fluent/plugin/out_azurestorage_gen2.rb

@@ -34,6 +34,7 @@ module Fluent::Plugin
         config_param :store_as, :string, :default => "none"
         config_param :auto_create_container, :bool, :default => false
         config_param :skip_container_check, :bool, :default => false
+        config_param :enable_retry, :bool, :default => false
         config_param :format, :string, :default => "out_file"
         config_param :time_slice_format, :string, :default => '%Y%m%d'
         config_param :command_parameter, :string, :default => nil
@@ -138,7 +139,7 @@ module Fluent::Plugin
                         @current_index = 0
                         generate_log_name(metadata, @current_index)
                     end
-                    log.debug "Start uploading temp file: #{tmp.path}"
+                    log.debug "azurestorage_gen2: Start uploading temp file: #{tmp.path}"
                     content = File.open(tmp.path, 'rb') { |file| file.read }
                     upload_blob(content, metadata)
                     @last_azure_storage_path = @azure_storage_path
@@ -151,7 +152,7 @@ module Fluent::Plugin
 
         private
         def upload_blob(content, metadata)
-            log.debug "azurestorage_gen2:  Uploading blob: #{@azure_storage_path}"
+            log.debug "azurestorage_gen2: Uploading blob: #{@azure_storage_path}"
             existing_content_length = get_blob_properties(@azure_storage_path)
             if existing_content_length == 0
                 create_blob(@azure_storage_path)
@@ -298,7 +299,7 @@ module Fluent::Plugin
                 if response.success?
                     log.debug "azurestorage_gen2: Container '#{@azure_container}' created, response code: #{response.code}"
                 elsif response.timed_out?
-                    raise Fluent::UnrecoverableError,  "Creating container '#{@azure_container}' request timed out."
+                    raise Fluent::UnrecoverableError, "Creating container '#{@azure_container}' request timed out."
                 else
                     raise Fluent::UnrecoverableError, "Creating container request failed - code: #{response.code}, body: #{response.body}, headers: #{response.headers}"
                 end
@@ -330,7 +331,7 @@ module Fluent::Plugin
 
         private
         def append_blob_block(blob_path, content, position)
-            log.debug "azurestorage_gen2: append_blob_block.start: Append blob ('#{blob_path}') called with position #{position}"
+            log.debug "azurestorage_gen2: append_blob_block.start: Append blob ('#{blob_path}') called with position #{position} (content length: #{content.length}, end position: #{position + content.length})"
             datestamp = create_request_date
             headers = {:"x-ms-version" =>  ABFS_API_VERSION,  :"x-ms-date" => datestamp, :"Content-Length" => content.length}
             params = {:action => "append", :position => "#{position}"}
@@ -368,7 +369,7 @@ module Fluent::Plugin
                 elsif response.timed_out?
                     raise Fluent::UnrecoverableError,  "Bloub '#{blob_path}' flush request timed out."
                 else
-                    raise Fluent::UnrecoverableError, "Blob flush request failed - code: #{response.code}, body: #{response.body}, headers: #{response.headers}"
+                    raise_error "Blob flush request failed - code: #{response.code}, body: #{response.body}, headers: #{response.headers}"
                 end
             end
             request.run
@@ -506,6 +507,15 @@ module Fluent::Plugin
             Time.now.strftime('%a, %e %b %y %H:%M:%S %Z')
         end
 
+        private
+        def raise_error(error_message)
+            if @enable_retry
+                raise BlobOperationError, error_message
+            else
+                raise Fluent::UnrecoverableError,  error_message
+            end
+        end
+
         def uuid_random
             require 'uuidtools'
             ::UUIDTools::UUID.random_create.to_s
@@ -622,4 +632,10 @@ module Fluent::Plugin
           super(message)
         end
     end
+
+    class BlobOperationError < StandardError
+        def initialize(message="Default message")
+            super(message)
+        end
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azurestorage-gen2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Oliver Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-04 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd