lambdakiq 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc719ae59b3ba58dca3f268f2be9c3fc96f56c2c40eabee791da33da33b50534
-  data.tar.gz: 873a8d6563b4e17dcf52534b2776e166aeb0a18cd4992d3d91139bc60f77a4d9
+  metadata.gz: d6c7543a7f0f98a903e576b54cf791eb6efa83336b97a056bc4cce771634b04b
+  data.tar.gz: e03956eb1543b0c5f5576aee3dd007e62567be052059aa166e5c28efdefdd5af
 SHA512:
-  metadata.gz: b830f98d593b7fd995b946889669b8b7c6bf9c450df752abf6b6d17b4bf674ab393000691c5a92f089a07c73bddf99f6375aac4933a046cafefa55bf01bb2586
-  data.tar.gz: 2cbbd15df392bfc7b3837e22afafd177aaa9db739a0883ac7090772ec028ef05e8c621f575232f9bffe7151dda2789a748096bcadfd6cc8e526b6e30cc712d2a
+  metadata.gz: 20af5bc0de3846af919e8593187b180c78f3a04a953983529e0f0bdb73d6adb411e43d1e06c87bc31777f53e513cb2812ea703522a21fefc87a81cf46bd1c5ce
+  data.tar.gz: 978de57e0ec0c92019b1e5ff2946eb9447e2182886d61e68392ce999162317281ad96c58c216e4f00f4b23e77fb5dea16b3f5259ed95c66f1b498c27008f72e9

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v2.1.0
+
+#### Fixed
+
+- Ensure failed messages go to DLQ. Fixes #30. Fixes #31. Thanks @thenano
+
 ## v2.0.2
 
 #### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lambdakiq (2.0.2)
+    lambdakiq (2.1.0)
       activejob
       aws-sdk-sqs
       concurrent-ruby

data/lib/lambdakiq/job.rb

@@ -72,7 +72,11 @@ module Lambdakiq
         @error = e
       else
         instrument :retry_stopped, error: e
-        delete_message
+        if should_redrive?
+          @error = e
+        else
+          delete_message
+        end
       end
     end
 
@@ -97,10 +101,16 @@ module Lambdakiq
       executions > retry_limit
     end
 
+    def job_retry
+      [active_job.lambdakiq_retry, Lambdakiq.config.max_retries, 12].compact.min
+    end
+
     def retry_limit
-      config_retry = [Lambdakiq.config.max_retries, 12].min
-      [ (active_job.lambdakiq_retry || config_retry),
-        (queue.max_receive_count - 1) ].min
+      [job_retry, (queue.max_receive_count - 1)].min
+    end
+
+    def should_redrive?
+      !queue.redrive_policy.nil? && job_retry >= queue.max_receive_count
     end
 
     def fifo_delay?

data/lib/lambdakiq/queue.rb

@@ -22,11 +22,11 @@ module Lambdakiq
     end
 
     def redrive_policy
-      @redrive_policy ||= JSON.parse(attributes['RedrivePolicy'])
+      @redrive_policy ||= attributes['RedrivePolicy'] ? JSON.parse(attributes['RedrivePolicy']) : nil
     end
 
     def max_receive_count
-      redrive_policy['maxReceiveCount'].to_i
+      redrive_policy&.dig('maxReceiveCount')&.to_i || 1
     end
 
     def fifo?

data/lib/lambdakiq/version.rb

@@ -1,3 +1,3 @@
 module Lambdakiq
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lambdakiq
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob