hermes_messenger_of_the_gods 2.3.1 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 604daff161d76c0ebf41ab253989906c75c519aba9460282fc0644a3b3ed1cad
-  data.tar.gz: 201cda28475512177767a542e0c13f15780431dbc8cfd45f324425bccecc090c
+  metadata.gz: 7125cdbb19953c04ac555204b4a906d9a5bf2c465f297afa3de4af48b7a7a647
+  data.tar.gz: a9fcd712654790b61ef92ea6139ebd79a898b2e2f3925131c8c3d63fad392bcb
 SHA512:
-  metadata.gz: 607884c3e2d370128952cd2a832686dbaeade734ae3580143a677715d388faf47dc620049252e07230c7f920e64db09a4b30b2c8ee08c85a4e5a2a667bd7595d
-  data.tar.gz: a627e353104644dce6b85e0fb8dee0e6fe821742c2b29c3662140241c968cf0335991fe146143fd777460bd22b086f03dc1852249cdf64836f2d5b0b8816b071
+  metadata.gz: 508c3ea026d572f78c9817b184e2ce69a9dd4bb1ac0f3e428d4673a3301e76243eea9b15e296b3b37eafe4e4f3893dec963c0e1d0893e2edf37e0d1cb4c56d59
+  data.tar.gz: 0cb9563d15bd0bce32b2aa551ec70795eba5ee503cb55bc8f74dbf2666f3904817a2a190a4384843cb92342a93b5c489f744fe0a46dfe51e398bf4cb5063c790

data/lib/hermes_messenger_of_the_gods/concerns/message.rb

@@ -65,7 +65,7 @@ module HermesMessengerOfTheGods
               endpoint.dispatch!(self, endpoint_args) unless HermesMessengerOfTheGods.config.stub_dispatch
               register_success(ep_name, endpoint.result)
             rescue StandardError => e
-              error(e)
+              say_error(e)
               register_failure(ep_name, e)
             ensure
               endpoint.teardown

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.1'
+  VERSION = '2.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermes_messenger_of_the_gods
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.4
 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-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel