backburner-allq 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a73b5d7a8f60e385a3f600bfded5c0579691bbafdd4bc15b0f51e0df7298f4f
-  data.tar.gz: 26000c93ce60b0f53ff666f51f7fcd1549ddde403dd400f7f4c457e056803c92
+  metadata.gz: a66b297949437303186f84d3ab4198416a72824de72142dd4727aa029365f119
+  data.tar.gz: b737ec4f3df6378167da3d5936c408ea6b1a92b05391c3c4ab9021160108492c
 SHA512:
-  metadata.gz: a0d2079019d65e529e6b769ec860456bd13b2a29caf6797adcea9c1feca0f3b397d006ac9cd3e8a85e9d78a86af4ef8964d500d5822b001f730123705d80ada3
-  data.tar.gz: 747c8436582124a553424a1e674ae97a44fee865f74720fbe5e84ca5fc6006a05087a7e1c079a6acdb72c2414c7b94db0642fefbba886734d8b575735411ecbb
+  metadata.gz: 02ec21561843632c02a39742c7eef8591f94a7320af93bc77d566bc6e5d390c089fdeef1b56b5df3865a3430ad3e7a350b51d9faebfdb2fcebd4944905c4150e
+  data.tar.gz: 51ffee578303fd24e70278788153cc6265a356ddab6882c8bd62c7447c8434f7949b7d4deb35affd8a14d7d4f295d1494d48d89dc27e0eec9bf4c06ee69093b0

data/deploy.sh

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

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "1.0.17"
+  VERSION = "1.0.18"
 end

data/lib/backburner/worker.rb

@@ -135,35 +135,36 @@ module Backburner
       end
 
       if job
-        self.log_job_begin(job.name, job.args)
-        job.process
-        self.log_job_end(job.name)
-
-      rescue Backburner::Job::JobFormatInvalid => e
-        self.log_error self.exception_message(e)
-      rescue => e # Error occurred processing job
-        self.log_error self.exception_message(e) unless e.is_a?(Backburner::Job::RetryJob)
-
-        unless job
-          self.log_error "Error occurred before we were able to assign a job. Giving up without retrying!"
-          return
+        begin
+          self.log_job_begin(job.name, job.args)
+          job.process
+          self.log_job_end(job.name)
+        rescue Backburner::Job::JobFormatInvalid => e
+          self.log_error self.exception_message(e)
+        rescue => e # Error occurred processing job
+          self.log_error self.exception_message(e) unless e.is_a?(Backburner::Job::RetryJob)
+
+          unless job
+            self.log_error "Error occurred before we were able to assign a job. Giving up without retrying!"
+            return
+          end
+
+          # NB: There's a slight chance here that the connection to allq has
+          # gone down between the time we reserved / processed the job and here.
+          num_retries = job.releases
+          max_job_retries = resolve_max_job_retries(job.job_class)
+          retry_status = "failed: attempt #{num_retries+1} of #{max_job_retries+1}"
+          retry_delay = resolve_retry_delay(job.job_class)
+          delay = resolve_retry_delay_proc(job.job_class).call(retry_delay, num_retries) rescue retry_delay
+          if num_retries + 1 > max_job_retries
+            job.bury
+          else
+            job.release(delay)
+          end
+          self.log_job_end(job.name, "#{retry_status}, retrying in #{delay}s") if job_started_at
+
+          handle_error(e, job.name, job.args, job)
         end
-
-        # NB: There's a slight chance here that the connection to allq has
-        # gone down between the time we reserved / processed the job and here.
-        num_retries = job.releases
-        max_job_retries = resolve_max_job_retries(job.job_class)
-        retry_status = "failed: attempt #{num_retries+1} of #{max_job_retries+1}"
-        retry_delay = resolve_retry_delay(job.job_class)
-        delay = resolve_retry_delay_proc(job.job_class).call(retry_delay, num_retries) rescue retry_delay
-        if num_retries + 1 > max_job_retries
-          job.bury
-        else
-          job.release(delay)
-        end
-        self.log_job_end(job.name, "#{retry_status}, retrying in #{delay}s") if job_started_at
-
-        handle_error(e, job.name, job.args, job)
       end
       job
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Jason Malcolm