fluent-plugin-azurestorage-gen2 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04eea9a39f7cc1d5533d895d6efd3aa725cd9c44
-  data.tar.gz: 0c3779b86a040e07924c0e7d4f78a01cee9ac274
+  metadata.gz: 02170d63c314b7bb91fb1722b0ca1a4dccad9bd0
+  data.tar.gz: 7fc221dc0be643681800be67c954634caa7df518
 SHA512:
-  metadata.gz: 0ec050faad375da7b4b13b5686de44b9c9c7f24cef7bedc1f647392620a3dff379f2f409b475d072947215e50ff6ae6d3a976320467a0d41eb579883dc0ae79f
-  data.tar.gz: c71a5e917920770e4339bab5e208c51b53c9cfcd9a4afe7255996149da0b70db539d6ca12ba983c1147b9611ed8cb342831ce217c7a4adfde93ac3232a2225fb
+  metadata.gz: ad9f64e7f2af1d65177e683aa808df6187d9ace11a0f976a925a11d31e74db15c324b10035d4610ff387b5f2b3a1939c4f8c2cf5f7f25e4a237c16350b4ec620
+  data.tar.gz: eeff3b1a4c7ea0b48e207c270e1679ba770c2bca21146f879bfb893a1fca314419c5a7a6c35a1437ca4967dbd87a0d703c81b66a16d1326e187da90e2fcf1ac1

data/README.md

@@ -128,6 +128,10 @@ You can skip the initial container listing (and container creation) operations a
 
 If you set this option, operations can be retried in the buffer. Default value is false. (Used for create/update/flush Blob operations)
 
+### startup_fail_on_error
+
+If that setting is disabled, the worker won't fail on initialization (getting first access token) error. The default value is true.
+
 ### url_domain_suffix
 
 The defaultt `url_domain_suffix` is `.dfs.core.windows.net`, you can override this in case of private endpoints.

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/fluent-plugin-azurestorage-gen2.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path('../lib', __FILE__)
 Gem::Specification.new do |gem|
   gem.name = "fluent-plugin-azurestorage-gen2"
   gem.description = "Azure Storage output plugin for Fluentd event collector"
-  gem.license = "Apache-2.0"
+  gem.license = "MIT License"
   gem.homepage = "https://github.com/oleewere/fluent-plugin-azurestorage-gen2"
   gem.summary = gem.description
   gem.version = File.read("VERSION").strip

data/lib/fluent/plugin/out_azurestorage_gen2.rb

@@ -35,6 +35,7 @@ module Fluent::Plugin
         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 :startup_fail_on_error, :bool, :default => true
         config_param :url_domain_suffix, :string, :default => '.dfs.core.windows.net'
         config_param :format, :string, :default => "out_file"
         config_param :time_slice_format, :string, :default => '%Y%m%d'
@@ -186,7 +187,19 @@ module Fluent::Plugin
         def setup_access_token
             if @azure_storage_access_key.nil?
                 @get_token_lock = Concurrent::ReadWriteLock.new
-                acquire_access_token
+                if @startup_fail_on_error
+                    acquire_access_token
+                else
+                    while true
+                        begin
+                            acquire_access_token
+                            break
+                        rescue Exception => e
+                            log.warn("#{e.message}, acquired token failed, wait 20 seconds until next retry.")
+                            sleep 20
+                        end
+                    end
+                end
                 if @azure_oauth_refresh_interval > 0
                     log.info("azurestorage_gen2: Start getting access token every #{@azure_oauth_refresh_interval} seconds.")
                     @get_token_task = Concurrent::TimerTask.new(
@@ -220,7 +233,7 @@ module Fluent::Plugin
         # https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-storage#get-an-access-token-and-use-it-to-call-azure-storage
         private
         def acquire_access_token_msi
-            params = { :"api-version" => ACCESS_TOKEN_API_VERSION, :resource => "https://storage.azure.com/" }
+            params = { :"api-version" => ACCESS_TOKEN_API_VERSION, :resource => "https://storage.azures.com/" }
             unless @azure_instance_msi.nil?
                 params[:msi_res_id] = @azure_instance_msi
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-azurestorage-gen2
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Oliver Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -188,7 +188,7 @@ files:
 - test/plugin/test_out_azurestorage_gen2.rb
 homepage: https://github.com/oleewere/fluent-plugin-azurestorage-gen2
 licenses:
-- Apache-2.0
+- MIT License
 metadata: {}
 post_install_message: 
 rdoc_options: []