backburner-allq 1.0.20 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed4aae689c12e639f2f51a32aef5a59c80f0ab452f89fe2f29afb566474ba201
-  data.tar.gz: 62e79b474949889a1b992b7fa25a034a1c87a62d1d6db0ba5f8a01582e464071
+  metadata.gz: 619799b2d9a3617ef54fc3e6512d7c0753848d48cb37ee1c7c6be97e3de919d5
+  data.tar.gz: 968f980395b0f8353aff01edd5babe6cfe0ff69a17c74bed59ba84077b86bedd
 SHA512:
-  metadata.gz: 8f5e2bd1006d8d39e95f25b85b195ad7b8cefd5b77a16dd93ab095ef0ca080d90e04b63490e66d9247b47e9f97d2355e5b2fa9fe03b2c85dd413efa54d642a32
-  data.tar.gz: 26a7b05894906fc6d79f0e98b6bed0f67d5ea8c62b09c3b6b89acb89fb13811dc568353ce7432d89081ed79ff97f4f2da5c91ee5e20ba2131cddf10a875da7c0
+  metadata.gz: bfebc7d71a222d9ddd838852b1b131753178656750f520f3efd66cc5a248ecc460558e5960c443ac02a8ba5ee2541bac1e354a3704eabe6c52a56b490b498f12
+  data.tar.gz: 8fe4f7da71322bb541b953dc5616b95623334f8cb3835321d6b2a5b660463fa740f018795dd84a23db80feefad359453e3092755d70145607c91c021b2e344f3

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in backburner.gemspec
 gemspec
+
+

data/deploy.sh

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

data/lib/backburner.rb

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

data/lib/backburner/allq_wrapper.rb

@@ -81,6 +81,7 @@ module Backburner
   end
 
   class AllQWrapper
+    DEFAULT_TIMEOUT = 17800
     def initialize(url = 'localhost:8090')
       allq_conf = Allq::Configuration.new do |config|
         config.host = url
@@ -182,7 +183,7 @@ module Backburner
     def build_new_job(body, options)
       adjusted_priority = map_priority(options[:pri] || 5)
 
-      ttl = options[:ttl] || 600
+      ttl = options[:ttl] || options[:ttr] || DEFAULT_TIMEOUT
       tube_name = options[:tube_name] || 'default'
       delay = options[:delay] || 0
       parent_id = options[:parent_id]
@@ -199,7 +200,7 @@ module Backburner
 
     def build_new_parent_job(body, options)
       adjusted_priority = map_priority(options[:pri] || 5)
-      ttl = options[:ttl] || 600
+      ttl = options[:ttl] || options[:ttr] || DEFAULT_TIMEOUT
       tube_name = options[:tube_name] || 'default'
       delay = options[:delay] || 0
       parent_id = options[:parent_id]

data/lib/backburner/job.rb

@@ -25,6 +25,7 @@ module Backburner
       @body = task.body.is_a?(Hash) ? task.body : Backburner.configuration.job_parser_proc.call(task.body)
       @name = body["class"] || body[:class]
       @args = body["args"] || body[:args]
+      @ttr  = body["ttr"] || body[:ttr]
     rescue => ex # Job was not valid format
 #      self.bury
 #      raise JobFormatInvalid, "Job body could not be parsed: #{ex.inspect}"
@@ -42,13 +43,13 @@ module Backburner
     # @example
     #   @task.process
     #
-    def process
+    def process      
       # Invoke before hook and stop if false
       res = @hooks.invoke_hook_events(job_name, :before_perform, *args)
       return false unless res
       # Execute the job
       @hooks.around_hook_events(job_name, :around_perform, *args) do
-        job_class.perform(*args)
+        timeout_job_after(@ttr > 1 ? @ttr - 1 : @ttr) { job_class.perform(*args) }
       end
       task.delete
       # Invoke after perform hook

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "1.0.20"
+  VERSION = "1.0.25"
 end

data/lib/backburner/worker.rb

@@ -31,7 +31,7 @@ module Backburner
 
       return nil unless res # stop if hook is false
 
-      data = { :class => job_class.name, :args => args }
+      data = { :class => job_class.name, :args => args, :ttr => ttr }
       queue = opts[:queue] && (Proc === opts[:queue] ? opts[:queue].call(job_class) : opts[:queue])
 
       begin

data/lib/backburner/workers/threads_on_fork.rb

@@ -210,12 +210,7 @@ module Backburner
         puts "Run while can"
         while @garbage_after.nil? or @garbage_after > @runs
           @runs += 1 # FIXME: Likely race condition
-          ran_job = work_one_job(conn, @watched_tube_name)
-          # Wait a second if we didn't find a job
-          unless ran_job
-            puts "sleeping"
-            sleep(rand() * 3)
-          end
+          work_one_job(conn, @watched_tube_name)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.25
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allq_rest