logstash-output-azure_service_bus 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '083f7b36cee46fdb059036aaf5d1be5147d9847698668ccd47d2d55e2178726b'
-  data.tar.gz: 83a758c5fec612555dcd2bbd019ce6cc8fc6a387d0d0203b1f5af8bc8316ffd8
+  metadata.gz: 0f143bc449a2eb5ba96c5744fbbf835612b4e2bf4a3a55bc66636a77da7913dc
+  data.tar.gz: 61f7366ca88e30e4c8f08320d0b9d625483af5d70d3613641ae4944ae40eb2c1
 SHA512:
-  metadata.gz: 0be573d501e76e02a9ccc60fdbdaf79cde4550e9e0930ba6bfed8ace0721f9a659c176720ecacc6774bb27c80ae2329f1adadc10af2e476bb747f8b11f47bb64
-  data.tar.gz: 5de0f339d87b98804a369638051134c854d4860f9eb9d87d8a616ada52609cadad91edd89012562c9f64dfe111a3aa839214f5ecb575a63100ca611d05d1779e
+  metadata.gz: 002f1d700b00f56c3c8c446c37f55d483cefbe467d9d654646d7f21ea0b13c86a532a88c555e2686e97284543c4f0f74e65a4087b9d4717f0532e3a54cd8ac09
+  data.tar.gz: de134b2fc179f46fb2cb941cef151bf08c7daadaf7850368439450b17e14bf314ccf930c6ca8b802b9195bf90062f9a494c576614c1f7f26b1fcec834e8e550f

data/lib/logstash/outputs/azure_service_bus.rb

@@ -23,13 +23,16 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
       retry_statuses: [401, 403, 404, 410, 429, 500], # https://docs.microsoft.com/en-us/rest/api/servicebus/send-message-batch#response-codes
       retry_block: lambda do |env, _options, _retries, exception|
         if env.status.nil?
-          @logger.warn("Problem (#{exception}) for #{env.method.upcase} #{env.url}")
+          @logger.warn("Problem while sending message(s) to Service Bus: #{exception.inspect}")
         else
-          @logger.warn("Problem (HTTP #{env.status}) for #{env.method.upcase} #{env.url}")
+          @logger.warn("Problem while sending message(s) to Service Bus: HTTP #{env.status}")
+          if env.status == 401
+            refresh_access_token
+            env.request_headers['Authorization'] = "Bearer #{@access_token}"
+          end
         end
       end,
-      retry_if: lambda do |env, _exc|
-        refresh_access_token if env.status == 401
+      retry_if: lambda do |_env, _exc|
         true # Always retry
       end
     }
@@ -68,30 +71,31 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
     end
   rescue StandardError => e
     # Hopefully we never make it here and "throw away" messages since we have an agressive retry strategy.
-    @logger.error("Error (#{e}) while sending message to Service Bus")
+    @logger.error("Error while sending message(s) to Service Bus: #{e.inspect}")
   else
-    if response.status == 200
+    if response.status == 201
       @logger.debug("Sent #{messages.length} message(s) to Service Bus")
     else
-      @logger.error("Error while sending message to Service Bus: HTTP #{response.status}")
+      @logger.error("Error while sending message(s) to Service Bus: HTTP #{response.status}")
     end
   end
 
   def refresh_access_token
-    @logger.info('Refreshing Azure access token')
+    @logger.info('Refreshing Azure access token...')
     begin
       response = Faraday.get('http://169.254.169.254/metadata/identity/oauth2/token', { 'api-version' => '2018-02-01', 'resource' => 'https://servicebus.azure.net/' }) do |req|
         req.headers = { 'Metadata' => 'true' }
-        req.options.timeout = 4
+        req.options.timeout = 10
       end
     rescue StandardError => e # We just catch everything and move on since @service_bus_conn will handle retries.
-      @logger.error("Error while fetching access token: #{e}")
+      @logger.error("Error while fetching access token: #{e.inpsect}")
     else
       if response.status == 200
         data = JSON.parse(response.body)
         @access_token = data['access_token']
+        @logger.info('Successfully refreshed Azure access token')
       else
-        @logger.error("HTTP error when fetching access token: #{response.body}")
+        @logger.error("Error while fetching access token: HTTP #{response.status}")
       end
     end
   end

data/logstash-output-azure_service_bus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-azure_service_bus'
-  s.version       = '0.3.2'
+  s.version       = '0.3.5'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Send Logstash messages to Azure Service Bus.'
   s.homepage      = 'https://github.com/gharryg/logstash-output-azure_service_bus'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-azure_service_bus
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Harrison Golden