hermes_messenger_of_the_gods 2.2.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb594dd4aa42c53e4bb9f412dc0870f4de4361843007653f0b00f27d9dabb24b
-  data.tar.gz: 745bb17e713aa8271933429db47198a054f32d494257777b7064227e51ba8850
+  metadata.gz: 45e46de302befb016769708d8ec0e3d500e1dc3d83f3c2759eb37e089df3f54d
+  data.tar.gz: f678ce9af82af7750fce178b117c2e4fcc79a133d1e79d132d1ec9e29b9428c7
 SHA512:
-  metadata.gz: 161da7750d743c04bdc0a56be97fea405adeabe0ebb20bd42bd1c1afcebc08fec176309dd73126ca284b389a53ae489e5a8773583a20744b6a4da5a9145643ad
-  data.tar.gz: 477eb8aeb67d6d4011bf59f1fcadb0b9f0f2da98ec9a2b551e420e14f6197185a97e25912f2f6c6dfa1ce4d6f3b6f7709e76f3cb4bc864550b7649dfe9e0379e
+  metadata.gz: b4bfd0c75c08192c83866e6a5c744b9b4670a84858c93afcf24aab0af4ab8edb2ac2f7de7dc2d4dadc02eb27e906b34293a16d1fa0e5a75c35a35ba79618f30c
+  data.tar.gz: 64c3bdc04eaeebdfa0a73c0f7c0654f2274c2ef9a8f44f145b868b7805be971303a6b5e4df24b89522c7e348788dee68c67634e153b854820d93a72ae431a5c2

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

@@ -14,9 +14,14 @@ module HermesMessengerOfTheGods
         super
         @message_mux = Monitor.new
       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
@@ -33,11 +38,12 @@ module HermesMessengerOfTheGods
 
       # Basic Shutdown behavior:
       #   Allow in-progress message to finish working.
-      #   Reset visbility timeout to all un-executed messages (from current message to end of array) to 0 so they move 
+      #   Reset visbility timeout to all un-executed messages (from current message to end of array) to 0 so they move
       #   to other works
       #
       #   Break from polling
       def shutdown!
+        warn 'Shutdown command received'
         @shutdown = true
       end
 
@@ -46,7 +52,7 @@ module HermesMessengerOfTheGods
       end
 
       def work_off(&blk)
-        poller.before_request { |stats| throw :stop_polling if shutting_down? }
+        poller.before_request { |_stats| throw :stop_polling if shutting_down? }
 
         poller.poll(poll_options) do |messages, _stats|
           self.inflight_messages = messages = Array.wrap(messages)
@@ -60,11 +66,12 @@ module HermesMessengerOfTheGods
               # Work message returns true if the messager should be considered successful
               shutting_down? ? :shutdown : work_message(msg, &blk)
             end
-            
+
             poller.delete_messages(completion_results[true]) unless completion_results.fetch(true, []).empty?
             # Messages skipped due to shutdowns get their visibility set back to 0 so they restart
             # normal failed jobs will be left in queue until their visibility timeout expires to indicate a backoff
-            set_message_visibility(completion_results[:shutdown], 0) unless completion_results.fetch(:shutdown, []).empty?
+            set_message_visibility(completion_results[:shutdown], 0) unless completion_results.fetch(:shutdown,
+                                                                                                     []).empty?
           end
         end
       end
@@ -84,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
@@ -94,9 +106,9 @@ module HermesMessengerOfTheGods
       def has_pending_work?
         data = queue_data.attributes
 
-        approximate_pending_messages = data["ApproximateNumberOfMessages"].to_i -
-          data["ApproximateNumberOfMessagesNotVisible"].to_i -
-          data["ApproximateNumberOfMessagesDelayed"].to_i
+        approximate_pending_messages = data['ApproximateNumberOfMessages'].to_i -
+                                       data['ApproximateNumberOfMessagesNotVisible'].to_i -
+                                       data['ApproximateNumberOfMessagesDelayed'].to_i
 
         # Just in case the math is off
         approximate_pending_messages > 0
@@ -132,16 +144,14 @@ module HermesMessengerOfTheGods
             set_message_visibility(inflight_messages, new_time)
             sleep VISIBILITY_EXTEND_FREQUENCY
           rescue StandardError => e
-            STDERR.puts 'Error received trying to extend visibility'
-            STDERR.puts e.message
+            warn 'Error received trying to extend visibility'
+            warn e.message
 
             raise
           end
         end
       end
 
-      private 
-
       def set_message_visibility(messages, new_time)
         queue.change_message_visibility_batch(
           entries: messages.collect do |message|

data/lib/hermes_messenger_of_the_gods/testing/array_endpoint.rb

@@ -15,6 +15,8 @@ module HermesMessengerOfTheGods
         end
       end
 
+      attr_accessor :on_receive
+
       def received
         self.class.received[endpoint]
       end
@@ -29,7 +31,9 @@ module HermesMessengerOfTheGods
 
       def do_transmit(msg, opts, raw_message = {})
         pub_opts = fetch_option(:publish_options, raw_message) || {}
-        received << { message: msg, options: opts.merge(pub_opts) }
+        new_msg = { message: msg, options: opts.merge(pub_opts) }
+        received << new_msg
+        on_receive.call(new_msg) if on_receive
         "Recorded msg ##{self.class.received[endpoint].length} for #{endpoint}"
       end
     end

data/lib/hermes_messenger_of_the_gods/version.rb

@@ -1,3 +1,3 @@
 module HermesMessengerOfTheGods
-  VERSION = '2.2.0'
+  VERSION = '2.3.2'
 end

metadata

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