hermes_messenger_of_the_gods 2.3.4 → 2.4.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7125cdbb19953c04ac555204b4a906d9a5bf2c465f297afa3de4af48b7a7a647
-  data.tar.gz: a9fcd712654790b61ef92ea6139ebd79a898b2e2f3925131c8c3d63fad392bcb
+  metadata.gz: 9db3c55e00b3b57edc8fe5d4f2707d4d0d5660bc916190412e923adef5541966
+  data.tar.gz: b290f95419766f1931426c78fc48b7db740e4c73e538e9b9f137dd54cc63161e
 SHA512:
-  metadata.gz: 508c3ea026d572f78c9817b184e2ce69a9dd4bb1ac0f3e428d4673a3301e76243eea9b15e296b3b37eafe4e4f3893dec963c0e1d0893e2edf37e0d1cb4c56d59
-  data.tar.gz: 0cb9563d15bd0bce32b2aa551ec70795eba5ee503cb55bc8f74dbf2666f3904817a2a190a4384843cb92342a93b5c489f744fe0a46dfe51e398bf4cb5063c790
+  metadata.gz: 2cba3abed264d740bb49085085e1d8e21655eb62c9de8ce89abeaeaa848edfc8cc21db04c79c1a6a2a8a415d55fa9be9e55d3ff241e0e1ab10a81b207233e23b
+  data.tar.gz: cc3d65d5d64cf1039c64e32098b956b5793a061303eeb792d2d5115a1b1f0ef8cb99e539993f02ed8869523ef300adffa9e6dca0c0721c55154b970a49ec4656

data/lib/hermes_messenger_of_the_gods/concerns/message.rb

@@ -14,11 +14,7 @@ module HermesMessengerOfTheGods
       include ActiveModel::Model
       include HermesMessengerOfTheGods::Concerns::Base
 
-      attr_accessor :targeted_endpoints
-
-      def original_message
-        @original_message
-      end
+      attr_accessor :targeted_endpoints, :original_message, :source_endpoint
 
       def initialize(options = {})
         @monitor = Monitor.new
@@ -54,6 +50,15 @@ module HermesMessengerOfTheGods
         end
       end
 
+      def retry_at(future_time_or_seconds_in_future)
+        raise 'unable to set visiblity' if source_endpoint.nil? || original_message.nil?
+        unless source_endpoint.respond_to?(:set_reexecution_time)
+          raise "endpoint type doesn't support setting execution time"
+        end
+
+        source_endpoint.set_reexecution_time(original_message, future_time_or_seconds_in_future)
+      end
+
       def dispatch!(endpoint_args: {})
         run_callbacks :dispatch do
           validate!
@@ -155,13 +160,13 @@ module HermesMessengerOfTheGods
           _circuit_breaker_errors
         end
 
-
         def max_consecutive_failures
           _max_consecutive_failures
         end
 
         def max_consecutive_failures=(val)
           raise 'Expected an Integer' unless val.is_a?(Integer) || val.is_a?(NilClass)
+
           self._max_consecutive_failures = val
         end
 
@@ -169,12 +174,12 @@ module HermesMessengerOfTheGods
           val ||= {}
           raise 'Expected a hash' unless val.is_a?(Hash)
 
-          val.each do |err, actions|
+          val.each do |err, _actions|
             val[err][:sleep] ||= 0
             val[err][:fatal] ||= false
           end
 
-          val.each do |err, actions|
+          val.each do |_err, actions|
             raise ':sleep must be a number' unless actions[:sleep].is_a?(Numeric)
             raise ':fatal must be a boolean' unless [true, false].include?(actions[:fatal])
           end
@@ -183,9 +188,7 @@ module HermesMessengerOfTheGods
         end
 
         def endpoints=(val)
-          unless val.is_a?(Hash)
-            raise 'Endpoints expects a hash {endpoint_name: endpoint_handler}'
-          end
+          raise 'Endpoints expects a hash {endpoint_name: endpoint_handler}' unless val.is_a?(Hash)
 
           self._endpoints = val
         end

data/lib/hermes_messenger_of_the_gods/concerns/worker.rb

@@ -40,7 +40,9 @@ module HermesMessengerOfTheGods
           endpoint.work_off do |job, original_message|
             self.last_task_performed = Time.now
 
-            built_job = deserialize(job, original_message)
+            built_job = deserialize(job)
+            built_job.original_message = original_message
+            built_job.source_endpoint = endpoint
             instrument(:starting_job, job: built_job)
             built_job.validate! if built_job.respond_to?(:validate!)
             run_job(built_job)
@@ -99,12 +101,10 @@ module HermesMessengerOfTheGods
           self.consecutive_failures += 1
         end
 
-        def deserialize(raw_job, original_message)
+        def deserialize(raw_job)
           instrument(:deserialization, job: raw_job) do
             deserialize_method = self.class.deserialize_method || :from_message
-            self.class.deserialize_with.send(deserialize_method, raw_job).tap do |obj|
-              obj.instance_variable_set :@original_message, original_message
-            end
+            self.class.deserialize_with.send(deserialize_method, raw_job)
           end
         end
 

data/lib/hermes_messenger_of_the_gods/endpoints/sqs.rb

@@ -13,6 +13,7 @@ module HermesMessengerOfTheGods
       def initialize(*args)
         super
         @message_mux = Monitor.new
+        @work_start_time_mux = Monitor.new
       end
 
       def poller
@@ -24,6 +25,14 @@ module HermesMessengerOfTheGods
         )
       end
 
+      def work_start_time
+        @work_start_time_mux.synchronize { @work_start_time }
+      end
+
+      def reset_work_start_time!
+        @work_start_time_mux.synchronize { @work_start_time = Time.now }
+      end
+
       def inflight_messages
         @message_mux.synchronize { @inflight_messages ||= [] }
       end
@@ -67,15 +76,35 @@ module HermesMessengerOfTheGods
               shutting_down? ? :shutdown : work_message(msg, &blk)
             end
 
-            poller.delete_messages(completion_results[true]) unless completion_results.fetch(true, []).empty?
+            unless completion_results.fetch(true, []).empty?
+              poller.delete_messages(completion_results[true] & inflight_messages)
+            end
             # 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?
+            unless completion_results.fetch(:shutdown, []).empty?
+              set_message_visibility(completion_results[:shutdown] & inflight_messages, 0)
+            end
           end
         end
       end
 
+      def set_reexecution_time(message, duration_or_time)
+        # You can pass a time to re-run at or you can pass the seconds in the future to run at
+        extend_time = if duration_or_time.is_a?(Time)
+                        duration_or_time - Time.now
+                      else
+                        duration_or_time
+                      end
+
+        message_array = [message]
+
+        @message_mux.synchronize do
+          set_message_visibility(message_array, (Time.now - work_start_time) + extend_time)
+
+          @inflight_messages -= message_array
+        end
+      end
+
       def work_message(message)
         message_body = decode_message(message)
 
@@ -130,6 +159,7 @@ module HermesMessengerOfTheGods
       end
 
       def working_messages
+        reset_work_start_time!
         thread = start_visibility_update_thread
         yield
       ensure
@@ -137,10 +167,9 @@ module HermesMessengerOfTheGods
       end
 
       def start_visibility_update_thread
-        start_work_time = Time.now
         Thread.new do
           loop do
-            new_time = (Time.now - start_work_time) + VISIBILITY_EXTEND_DURATION
+            new_time = (Time.now - work_start_time) + VISIBILITY_EXTEND_DURATION
             set_message_visibility(inflight_messages, new_time)
             sleep VISIBILITY_EXTEND_FREQUENCY
           rescue StandardError => e

data/lib/hermes_messenger_of_the_gods/version.rb

@@ -1,3 +1,3 @@
 module HermesMessengerOfTheGods
-  VERSION = '2.3.4'
+  VERSION = '2.4.0.pre1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hermes_messenger_of_the_gods
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.0.pre1
 platform: ruby
 authors:
 - Brian Malinconico
@@ -222,18 +222,10 @@ files:
 - lib/hermes_messenger_of_the_gods/testing/rspec_helpers.rb
 - lib/hermes_messenger_of_the_gods/version.rb
 - packageGems.sh
-- vendor/cache/activemodel-6.1.4.1.gem
-- vendor/cache/activesupport-6.1.4.1.gem
 - vendor/cache/addressable-2.8.0.gem
 - vendor/cache/aws-eventstream-1.2.0.gem
-- vendor/cache/aws-partitions-1.509.0.gem
-- vendor/cache/aws-sdk-core-3.121.1.gem
-- vendor/cache/aws-sdk-sns-1.45.0.gem
-- vendor/cache/aws-sdk-sqs-1.44.0.gem
-- vendor/cache/aws-sigv4-1.4.0.gem
 - vendor/cache/codeclimate-test-reporter-1.0.7.gem
 - vendor/cache/coderay-1.1.3.gem
-- vendor/cache/concurrent-ruby-1.1.9.gem
 - vendor/cache/coveralls_reborn-0.22.0.gem
 - vendor/cache/crack-0.4.5.gem
 - vendor/cache/diff-lcs-1.4.4.gem
@@ -244,11 +236,8 @@ files:
 - vendor/cache/grpc-1.40.0-universal-darwin.gem
 - vendor/cache/grpc-1.40.0-x86_64-linux.gem
 - vendor/cache/hashdiff-1.0.1.gem
-- vendor/cache/i18n-1.8.10.gem
-- vendor/cache/jmespath-1.4.0.gem
 - vendor/cache/memory_profiler-1.0.0.gem
 - vendor/cache/method_source-1.0.0.gem
-- vendor/cache/minitest-5.14.4.gem
 - vendor/cache/pry-0.14.1.gem
 - vendor/cache/public_suffix-4.0.6.gem
 - vendor/cache/rake-10.5.0.gem
@@ -267,9 +256,7 @@ files:
 - vendor/cache/thor-1.1.0.gem
 - vendor/cache/timecop-0.9.4.gem
 - vendor/cache/tins-1.29.1.gem
-- vendor/cache/tzinfo-2.0.4.gem
 - vendor/cache/webmock-3.14.0.gem
-- vendor/cache/zeitwerk-2.4.2.gem
 homepage:
 licenses: []
 metadata:
@@ -285,9 +272,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.22
 signing_key: