hermes_messenger_of_the_gods 2.3.0 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f14fead382b4de9c274888ee9c417f5b7e500846e118b9e655af25b182164184
-  data.tar.gz: 47edc08f7f760c868ae6c2e2443d4f7138ce23c4b260ae9a288e2b1c5d73f4a4
+  metadata.gz: 4c3b23fec66c0a1e150672c00be3bff512ae95edb8159c5f4d43b83198df9f0a
+  data.tar.gz: 1bfa70e4c8e9bb56c0d3e27e625239e03eeb16567119eee90f7c55ea9043146e
 SHA512:
-  metadata.gz: daf9a9781dae2a7243c5b98f06d4a929526c2430d29e52a328d5a94c045a7e016c59844dbf72eed9d773da91f396e0c51efc5d1af6d307b69f2d8940af36084e
-  data.tar.gz: 2e6e02d9a36ce06a0df77e7b732fafbb023cad0e3b0a33e107522b7d798ed9363e655e9c96da92c5a9af2f4961cfe460f33e6771a4bea671fa7998c9d1967801
+  metadata.gz: b32b27892082385431cc44a19f7552a6d1b788a55067576713ad9e9cff7ff147ea3ac693de7134730531af75285e4d1a62cceafe899a1857a85f51de3fc620b9
+  data.tar.gz: 1f46c52269a3c7df4d422813dfba7c6c391772cc9b3e3b64da9a79f9c1aeaa30561612d2ec5558d155953588a5a7fc39bcc40164f39565ed913566b570ee7615

data/lib/hermes_messenger_of_the_gods/concerns/message.rb

@@ -61,7 +61,7 @@ module HermesMessengerOfTheGods
           endpoints.collect do |ep_name, endpoint|
             next if targeted_endpoints && !targeted_endpoints.include?(ep_name)
 
-            Thread.new do
+            begin
               endpoint.dispatch!(self, endpoint_args) unless HermesMessengerOfTheGods.config.stub_dispatch
               register_success(ep_name, endpoint.result)
             rescue StandardError => e
@@ -70,7 +70,7 @@ module HermesMessengerOfTheGods
             ensure
               endpoint.teardown
             end
-          end.compact.map(&:join)
+          end
 
           unless dispatch_errors.empty?
             klass = if successes.empty?

data/lib/hermes_messenger_of_the_gods/configuration.rb

@@ -10,7 +10,7 @@ module HermesMessengerOfTheGods
           if instance_variable_defined?("@#{meth}")
             instance_variable_get("@#{meth}")
           else
-            instance_variable_set("@#{meth}", default)
+            instance_variable_set("@#{meth}", default.respond_to?(:call) ? default.call() : default)
           end
         end
       end
@@ -25,5 +25,8 @@ module HermesMessengerOfTheGods
     attr_accessor_with_default :stub_dispatch, false
 
     attr_accessor_with_default :kill_on_consecutive_failures, false
+
+    attr_accessor_with_default :sqs_client, -> { Aws::SQS::Client.new }
+    attr_accessor_with_default :sns_client, -> { Aws::SNS::Client.new }
   end
 end

data/lib/hermes_messenger_of_the_gods/endpoints/sns.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-sns'
 require 'json'
 
@@ -5,15 +7,16 @@ module HermesMessengerOfTheGods
   module Endpoints
     class Sns < Base
       def sns_topic
-        @sns_topic ||= Aws::SNS::Topic.new(self.endpoint,
-                                           self.options[:client_options] || {}
-                                          )
+        @sns_topic ||= Aws::SNS::Topic.new(endpoint,
+                                           {
+                                             client: HermesMessengerOfTheGods.configuration.sns_client
+                                           }.merge(options[:client_options] || {}))
       end
 
       def transmit(message, raw_message, dispatch_options = {})
         pub_opts = fetch_option(:publish_options, raw_message) || {}
 
-        message = JSON.dump(message) if self.options[:jsonify]
+        message = JSON.dump(message) if options[:jsonify]
         sns_topic.publish(pub_opts.merge(dispatch_options, message: message))
       end
     end

data/lib/hermes_messenger_of_the_gods/endpoints/sqs.rb

@@ -16,7 +16,12 @@ module HermesMessengerOfTheGods
       end
 
       def poller
-        @poller ||= Aws::SQS::QueuePoller.new(endpoint)
+        @poller ||= Aws::SQS::QueuePoller.new(
+          endpoint,
+          {
+            client: HermesMessengerOfTheGods.configuration.sqs_client
+          }.merge(options[:client_options] || {})
+        )
       end
 
       def inflight_messages
@@ -38,7 +43,7 @@ module HermesMessengerOfTheGods
       #
       #   Break from polling
       def shutdown!
-        say Logger::INFO, 'Shutdown command received'
+        warn 'Reveived shutdown signal'
         @shutdown = true
       end
 
@@ -86,7 +91,12 @@ module HermesMessengerOfTheGods
       end
 
       def queue
-        @queue ||= Aws::SQS::Queue.new(endpoint, options[:client_options] || {})
+        @queue ||= Aws::SQS::Queue.new(
+          endpoint,
+          {
+            client: HermesMessengerOfTheGods.configuration.sqs_client
+          }.merge(options[:client_options] || {})
+        )
       end
 
       def queue_data
@@ -134,8 +144,8 @@ module HermesMessengerOfTheGods
             set_message_visibility(inflight_messages, new_time)
             sleep VISIBILITY_EXTEND_FREQUENCY
           rescue StandardError => e
-            warn 'Error received trying to extend visibility'
-            warn e.message
+            say_warn 'Error received trying to extend visibility'
+            say_warn e.message
 
             raise
           end

data/lib/hermes_messenger_of_the_gods/logging_helpers.rb

@@ -6,7 +6,7 @@ module HermesMessengerOfTheGods
 
     included do
       Logger::Severity.constants.each do |sev|
-        define_method(sev.downcase) do |msg = nil, &blk|
+        define_method("say_#{sev.downcase}") do |msg = nil, &blk|
           say("Logger::#{sev}".constantize, msg, &blk)
         end
       end

data/lib/hermes_messenger_of_the_gods/output/basic.rb

@@ -13,41 +13,41 @@ module HermesMessengerOfTheGods
 
         @subscriptions = [
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.worker.starting') do |*_, payload|
-            payload[:worker].info { "Starting Worker" }
+            payload[:worker].say_info { "Starting Worker" }
           end,
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.worker.run_job') do |_, start, finish, _, payload|
-            payload[:worker].debug { "Completed #{to_log_s(payload[:job])} in #{finish - start}s" }
+            payload[:worker].say_debug { "Completed #{to_log_s(payload[:job])} in #{finish - start}s" }
           end,
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.worker.starting_job') do |*_, payload|
-            payload[:worker].info { "Starting Job #{to_log_s(payload[:job])}" }
+            payload[:worker].say_info { "Starting Job #{to_log_s(payload[:job])}" }
           end,
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.worker.success') do |*_, payload|
-            payload[:worker].info { "Finished Job #{to_log_s(payload[:job])}" }
+            payload[:worker].say_info { "Finished Job #{to_log_s(payload[:job])}" }
           end,
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.worker.failure') do |*_, payload|
-            payload[:worker].error { "Error in #{to_log_s(payload[:job])}: #{payload[:error].message}" }
-            payload[:worker].debug { "backtrace: #{payload[:error].backtrace}"  }
+            payload[:worker].say_error { "Error in #{to_log_s(payload[:job])}: #{payload[:error].message}" }
+            payload[:worker].say_debug { "backtrace: #{payload[:error].backtrace}"  }
           end,
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.worker.fatal_error') do |*_, payload|
-            payload[:worker].error { "Fatal Error: #{to_log_s(payload[:job])}: #{payload[:exception].message}" }
-            payload[:worker].debug { "backtrace: #{payload[:exception].backtrace}"  }
+            payload[:worker].say_error { "Fatal Error: #{to_log_s(payload[:job])}: #{payload[:exception].message}" }
+            payload[:worker].say_debug { "backtrace: #{payload[:exception].backtrace}"  }
           end,
           # Message Output
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.message.dispatch') do |_, _start, _finish, _, payload|
-            payload[:message].info { "Dispatch complete in #{to_log_s(payload[:job])}s" }
+            payload[:message].say_info { "Dispatch complete in #{to_log_s(payload[:job])}s" }
           end,
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.message.dispatch_failure') do |*_, payload|
-            payload[:message].debug { "Dispatch failure to #{to_log_s(payload[:job])}: #{payload[:exception].inspect}" }
+            payload[:message].say_debug { "Dispatch failure to #{to_log_s(payload[:job])}: #{payload[:exception].inspect}" }
           end,
           # Endpoint Output
           ActiveSupport::Notifications.subscribe('hermes_messenger_of_the_gods.endpoint.dispatch') do |_, start, finish, _, payload|
-            payload[:endpoint].info { "Dispatch complete in #{finish - start}s #{" FAILED" if payload.has_key?(:exception)}" }
+            payload[:endpoint].say_info { "Dispatch complete in #{finish - start}s #{" FAILED" if payload.has_key?(:exception)}" }
           end,
           ActiveSupport::Notifications.subscribe(/hermes_messenger_of_the_gods.endpoint.(dispatch|final)_failure/) do |name, *_, payload|
-            payload[:endpoint].debug { "Dispatch #{"final " if name.include?('final_')} failure ##{payload[:try]} to #{payload[:endpoint_name]}: #{payload[:exception].inspect}" }
+            payload[:endpoint].say_debug { "Dispatch #{"final " if name.include?('final_')} failure ##{payload[:try]} to #{payload[:endpoint_name]}: #{payload[:exception].inspect}" }
           end,
           ActiveSupport::Notifications.subscribe(/hermes_messenger_of_the_gods.endpoint.read_failure/) do |name, *_, payload|
-            payload[:endpoint].error { "A message was received that could not be decoded: #{payload[:exception].message}" }
+            payload[:endpoint].say_error { "A message was received that could not be decoded: #{payload[:exception].message}" }
           end,
         ]
       end

data/lib/hermes_messenger_of_the_gods/version.rb

@@ -1,3 +1,3 @@
 module HermesMessengerOfTheGods
-  VERSION = '2.3.0'
+  VERSION = '2.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermes_messenger_of_the_gods
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.3
 platform: ruby
 authors:
 - Brian Malinconico
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2022-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel