hanami-events-cloud_pubsub 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b535cead0f43738abd37ba5487c71c04fe58dfc0af3c22cc0860f86ca8c3036
-  data.tar.gz: 2b0175b75fa4caed47c2b592a674b39ccd2ee392adf715a52211a70b4a633ba2
+  metadata.gz: e51fcb2486cdeca9c675d1a37e4c70f21ba9cad09fc3a148294cb03f1a2570ec
+  data.tar.gz: cdfad2c9b22abf3c4c80349b977c7f966e0a1c40faf955f4553ab06cbf999eb1
 SHA512:
-  metadata.gz: f8916a647db7d0d14c8b56fa3e359fc553cb022d28b989de6f1442aaa18dd96605f16eb089dec0ccdcb0aea9f6730c950907e3fd5b6bae8c801c194f87c61a7b
-  data.tar.gz: 3002bd4edceba5fd9a85dfbd0b0e58407283775b37cf301e97a08f95c2a13bf1257ab274d7aedea1ad44c5da42ac1e7ae46cb0b7a35c82051a167ec630ac95a4
+  metadata.gz: 820f3a4bed9594d8ce3b287232d59d1a4d2b96334b6b4ce4ce5ee0693db56536902e89773321f7486319a86a1f39f077ec1410c4a5cd5930004366325724feb0
+  data.tar.gz: 6349ab7adf08c16a7847f51e94278ca771a40ebf1ebbb567b1b78c53e8dabea06143e5a37b07f119533b7d91fa17c331e4693dd4ffe356f69f4f97b4f42c3311

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    hanami-events-cloud_pubsub (2.1.3)
+    hanami-events-cloud_pubsub (2.1.4)
       dry-configurable (~> 0.8.0)
       google-cloud-pubsub (~> 0.34.0)
       hanami-cli (~> 0.2)

data/lib/hanami/events/cloud_pubsub/middleware/auto_retry.rb

@@ -7,8 +7,11 @@ module Hanami
       module Middleware
         # Middleware used for automatically acknowledging messages
         class AutoRetry
-          def initialize(logger: nil)
+          attr_reader :max_attempts
+
+          def initialize(logger: nil, max_attempts: 1200)
             @logger = logger
+            @max_attempts = max_attempts
           end
 
           def call(message, args = {})
@@ -26,22 +29,48 @@ module Hanami
           private
 
           def ack_or_reject(message, succeeded, failed, args)
-            id = message.message_id
-
             if succeeded
-              message.acknowledge!
-              logger.debug "Message(#{id}) was acknowledged"
+              handle_success(message, args)
+            elsif failed && max_attempts_reached?(args)
+              handle_max_attempts_reached(message, args)
             elsif failed
-              seconds = calculate_backoff_seconds(message, args)
-              success = message.modify_ack_deadline!(seconds)
-              msg = "added #{success ? seconds : 0} seconds of delay to ack deadline"
-              logger.debug "Message(#{id}) failed, #{msg}" if success
+              handle_failure(message, args)
             else
-              message.reject!
-              logger.warn "Message(#{id}) was terminated from outside, rescheduling"
+              handle_unfinished(message, args)
             end
           end
 
+          def handle_success(message, _args)
+            message.acknowledge!
+            logger.debug "Message(#{message.message_id}) was acknowledged"
+          end
+
+          def max_attempts_reached?(args)
+            args.key?(:attempts) && args[:attempts] >= max_attempts
+          end
+
+          def handle_max_attempts_reached(message, _args)
+            id = message.message_id
+            msg = 'number of attempts exceeded max attempts ' \
+                  "of #{max_attempts}, acknowledging message"
+            logger.debug "Message(#{id}) failed, #{msg}"
+            message.acknowledge!
+          end
+
+          def handle_failure(message, args)
+            id = message.message_id
+            seconds = calculate_backoff_seconds(message, args)
+            success = message.modify_ack_deadline!(seconds)
+            msg = "added #{success ? seconds : 0} seconds of delay to ack deadline"
+            logger.debug "Message(#{id}) failed, #{msg}" if success
+          end
+
+          def handle_unfinished(message, _args)
+            id = message.message_id
+            message.reject!
+            logger.warn "Message(#{id}) was terminated from outside, rescheduling"
+          end
+
           def logger
             @logger || CloudPubsub.logger
           end

data/lib/hanami/events/cloud_pubsub/version.rb

@@ -3,7 +3,7 @@
 module Hanami
   module Events
     module CloudPubsub
-      VERSION = '2.1.3'
+      VERSION = '2.1.4'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-events-cloud_pubsub
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Ian Ker-Seymer