backburner-allq 1.0.40 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 682416738c55b9567c39530b31bfc92a8d9115b51c640494b067c9ff23cca65d
-  data.tar.gz: 9239e634bea3dc41131c9a4deb56d5998b6f4745e891c43a90fad4c569008c0c
+  metadata.gz: c5dcd95e3e7a1229fa9beae808c6a8b066f9ad1196cab9823da13b4b4d5a0bd6
+  data.tar.gz: 5910380ebb1cfc32d6bcdb8eaeca810542031441b13edec7292bd9037d2015b1
 SHA512:
-  metadata.gz: 127ae4b11fcc7651aeed81e9070a791460b2256fb2d308b559e70e9c4ba767d6c8cce5feed450e783c22415f84757e248d4b70de3fb27612317fb14283794b60
-  data.tar.gz: 06e8e765a1f8a6fd55ce3c0405bd319e797c59d87f5f54cebdee9bba2804d888cd8f4765bb8e02935d5b96dde7c38a756df073610106d8df8243f5dc16694f7f
+  metadata.gz: db95db3250925cd15b59a3c639e81962774a98fd477867ff26d72a78a55bf2d3e22b29e7ce8839941bfbe804497240ce6c4df379c8073841b00a087cd84c8ae2
+  data.tar.gz: ffb9e8b59553584c3b26356c5b4ae298ed67e06f8a83cc354888ea30166f288b82249346a90e8a5de77e546526eb65b78fc82e81cf92a110a645f8f0f5e43f98

data/deploy.sh

@@ -1,3 +1,3 @@
 echo "Did you update the version?"
 gem build backburner-allq.gemspec
-gem push backburner-allq-1.0.40.gem
+gem push backburner-allq-1.0.45.gem

data/lib/backburner/allq_wrapper.rb

@@ -117,8 +117,8 @@ module Backburner
       @client.job_delete(job.id)
     end
 
-    def release(job, _delay = 0)
-      @client.release_put(job.id)
+    def release(job, delay = 0)
+      @client.release_put(job.id, delay: delay)
     end
 
     def bury(job)

data/lib/backburner/job.rb

@@ -9,7 +9,7 @@ module Backburner
     class JobFormatInvalid < RuntimeError; end
     class RetryJob < RuntimeError; end
 
-    attr_accessor :task, :body, :name, :args
+    attr_accessor :task, :body, :name, :args, :stats_releases
 
     # Construct a job to be parsed and processed
     #
@@ -78,6 +78,10 @@ module Backburner
       raise e
     end
 
+    def stats_releases
+      @task.releases
+    end
+
     def bury
       @hooks.invoke_hook_events(job_name, :on_bury, *args)
       @task.bury
@@ -85,7 +89,7 @@ module Backburner
 
     def retry(count, delay)
       @hooks.invoke_hook_events(job_name, :on_retry, count, delay, *args)
-      @task.release(delay: delay)
+      @task.release(delay)
     end
 
     # Returns the class for the job handler
@@ -116,6 +120,7 @@ module Backburner
       nil
     end
 
+
     # Timeout job within specified block after given time.
     #
     # @example

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "1.0.40"
+  VERSION = "1.0.45"
 end

data/lib/backburner/worker.rb

@@ -161,6 +161,7 @@ module Backburner
         rescue Backburner::Job::JobFormatInvalid => e
           log_error exception_message(e)
         rescue StandardError => e # Error occurred processing job
+          log_error "Exception during process"
           log_error exception_message(e) unless e.is_a?(Backburner::Job::RetryJob)
 
           unless job
@@ -168,6 +169,8 @@ module Backburner
             return
           end
 
+          handle_failure_for_job(job)
+
           handle_error(e, job.name, job.args, job)
         end
       else
@@ -176,6 +179,28 @@ module Backburner
       job
     end
 
+
+    def handle_failure_for_job(job)
+      log_error "Handle failure for job"
+
+      num_retries = job.task.releases
+      max_job_retries = resolve_max_job_retries(job.job_class)
+
+      retry_status = "failed: attempt #{num_retries+1} of #{max_job_retries+1}"
+
+      if num_retries < max_job_retries # retry again
+        retry_delay = resolve_retry_delay(job.job_class)
+        delay = resolve_retry_delay_proc(job.job_class).call(retry_delay, num_retries) rescue retry_delay
+log_error("Delay should be #{delay}")
+        job.retry(num_retries + 1, delay)
+        log_job_end(job.name, "#{retry_status}, retrying in #{delay}s") if job_started_at
+      else # retries failed, bury
+        job.bury
+        log_job_end(job.name, "#{retry_status}, burying") if job_started_at
+      end
+
+    end
+
     protected
 
     # Return a new connection instance

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.40
+  version: 1.0.45
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allq_rest