backburner-allq 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aea14c4ca2fa04f46e103f147d265c60a79cbcfab02c76ab5cfc333683cbbf3
-  data.tar.gz: '08768dfb235b89694e401a67e20f963ec0bff7f9bdbaaceb178e7995e884d7cd'
+  metadata.gz: 2a73b5d7a8f60e385a3f600bfded5c0579691bbafdd4bc15b0f51e0df7298f4f
+  data.tar.gz: 26000c93ce60b0f53ff666f51f7fcd1549ddde403dd400f7f4c457e056803c92
 SHA512:
-  metadata.gz: e43b3ae23ce17153380d0b2d03ff98344dabb2002e287edde44b3d878b08989671391d29ed8617c756a296f07962ebb4580421bb826a7ad7a2b2e30bd26e9bf7
-  data.tar.gz: d8ae8904ede1db1c330674134a4301b1658b98bb69a268fbe20fda986590b29747216ea40e68d287979f9fa2f6439e727e95432927fe35a86c74897d9ba4c0d3
+  metadata.gz: a0d2079019d65e529e6b769ec860456bd13b2a29caf6797adcea9c1feca0f3b397d006ac9cd3e8a85e9d78a86af4ef8964d500d5822b001f730123705d80ada3
+  data.tar.gz: 747c8436582124a553424a1e674ae97a44fee865f74720fbe5e84ca5fc6006a05087a7e1c079a6acdb72c2414c7b94db0642fefbba886734d8b575735411ecbb

data/deploy.sh

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

data/lib/backburner/version.rb

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

data/lib/backburner/worker.rb

@@ -134,35 +134,38 @@ module Backburner
         return
       end
 
-      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)
+      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
+        end
 
-      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
 
-      # 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)
+        handle_error(e, job.name, job.args, job)
       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)
+      job
     end
 
 
@@ -175,7 +178,9 @@ module Backburner
 
     # Reserve a job from the watched queues
     def reserve_job(conn, reserve_timeout = Backburner.configuration.reserve_timeout)
-      Backburner::Job.new(conn.get(@tube_names.sample))
+      job = conn.get(@tube_names.sample)
+      return nil if job.body == nil?
+      Backburner::Job.new(job)
     end
 
     # Returns a list of all tubes known within the system

data/lib/backburner/workers/threads_on_fork.rb

@@ -207,7 +207,9 @@ module Backburner
       def run_while_can(conn = connection)
         while @garbage_after.nil? or @garbage_after > @runs
           @runs += 1 # FIXME: Likely race condition
-          work_one_job(conn)
+          ran_job = work_one_job(conn)
+          # Wait a second if we didn't find a job
+          sleep(rand() * 3) unless ran_job
         end
       end
 

metadata

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