backburner-allq 1.0.12 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7876b8c587bb8dcd70760ec2f29395d5c37cb14c0e4980217a9a8b4e6c4163a5
-  data.tar.gz: 40fbe69e88ab561358a19035ae102e345635891fc7bd9ff1c24b9d0beb033e4e
+  metadata.gz: a66b297949437303186f84d3ab4198416a72824de72142dd4727aa029365f119
+  data.tar.gz: b737ec4f3df6378167da3d5936c408ea6b1a92b05391c3c4ab9021160108492c
 SHA512:
-  metadata.gz: 345458382a5f37e53b816d3ede71ae75ec3abf82fff70c5a2607184992303ee00b3f2351bfa8ff4b770191369aaddb7b82aeb9255cfc92d3f0c893f21ac4bb54
-  data.tar.gz: 7fb582110bc654bf7645584e70c01a3c681c4c4137db190dead765c73146882931251f9292a291b2faab8976383e595b062df22bf1bacc88ddf3940575dd7671
+  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.12.gem
+gem push backburner-allq-1.0.18.gem

data/lib/backburner/allq_wrapper.rb

@@ -13,14 +13,16 @@ module Backburner
 
     def watch
       Thread.new do
-        ran = false
-        job = @allq_wrapper.get(@tube_name)
-        if job.body
-          perform(job)
-          ran = true
+        loop do
+          ran = false
+          job = @allq_wrapper.get(@tube_name)
+          if job.body
+            perform(job)
+            ran = true
+          end
+          # Wait if nothing returned
+          sleep(rand() * 3) unless ran
         end
-        # Wait if nothing returned
-        sleep(rand() * 3) unless ran
       end
     end
   end
@@ -123,6 +125,10 @@ module Backburner
       stats_hash.keys
     end
 
+    def tubes
+      tube_names
+    end
+
     def peek_buried(tube_name = 'default')
       job = nil
       job = @client.peek_get(tube_name, buried: true)
@@ -208,7 +214,7 @@ module Backburner
                                               priority: adjusted_priority,
                                               timeout: timeout,
                                               run_on_timeout: run_on_timeout,
-                                              shard_key: options[:shard_key]
+                                              shard_key: options[:shard_key],
                                               limit: limit)
       new_parent_job
     end
@@ -250,6 +256,11 @@ module Backburner
       result
     end
 
+    def stats(tube)
+      final_stats = stats
+      final_stats[tube]
+    end
+
     def stats
       raw_stats = @admin.stats_get
       final_stats = {}

data/lib/backburner/version.rb

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

data/lib/backburner/worker.rb

@@ -134,35 +134,39 @@ 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)
-
-      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)
+      if job
+        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
       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 +179,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.18
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allq_rest