backburner-allq 1.0.11 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be49d546e185343febc87691b110911a78dfe0f6fc268a20085442b0f21bbb73
-  data.tar.gz: ac1bc4e183f81ba0240bfc13ce20529213258acc3341c174cea53bc5707cdb0a
+  metadata.gz: 2a73b5d7a8f60e385a3f600bfded5c0579691bbafdd4bc15b0f51e0df7298f4f
+  data.tar.gz: 26000c93ce60b0f53ff666f51f7fcd1549ddde403dd400f7f4c457e056803c92
 SHA512:
-  metadata.gz: 4e515438a03f290084867129c0f749b4a6a0f6eb1a39749a24093b827b519077cacc0f2d17d4d446cef59b0ae533bd69d34f863d9f873b499e2c6608563ade92
-  data.tar.gz: a91dc0abcd0a2a0b03ab94ab0ab60275c5239626b40424f44b27b5f4bb8d6cd8404361196fcb8851a650d18848b12d091ca4b9d03f049ffa26eb5853e72c6539
+  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.11.gem
+gem push backburner-allq-1.0.17.gem

data/lib/backburner.rb

@@ -25,8 +25,8 @@ module Backburner
     # @example
     #   Backburner.enqueue NewsletterSender, self.id, user.id
     #
-    def enqueue(job_class, args, opts = {})
-      Backburner::Worker.enqueue(job_class, args, opts)
+    def enqueue(job_class, *args)
+      Backburner::Worker.enqueue(job_class, args, {})
     end
 
     # Begins working on jobs enqueued with optional tubes specified

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.11"
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.17
 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