backburner-allq 1.0.33 → 1.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c76bc8dcbc755e47c9f56134e031f01c0541fc96ad2fb68a88085d01b44bb79
-  data.tar.gz: e48bdeaa45c5197540cacfdc330f82bdfcf402ebec20fb449da3123a188bc598
+  metadata.gz: 6ac9dbeeb771c9821488a74064bc6bbe1e059cb9e4dc7faf4f25caf08054b4e6
+  data.tar.gz: 298634152be89db02b2b2898b57c9d2fbd9b27354c7b49068af6aadd5613dbe5
 SHA512:
-  metadata.gz: 929788a91d4f3502530ab7b2a13bec4179694de107539d887258155c2df37dfa5a6ad4e91817ecd1931bafe122a27094f54d6bdf86949890a43216be72fe59c4
-  data.tar.gz: 12f64be49c3ee12e93bc081688be13229ea8c5f21e67e7832e36836bd7b8de21fdf10d15410e821a0310e3ec8f54115489ae77ae1d48d25ccf6f93731c08011b
+  metadata.gz: 34ee7a51b82f0362485e2346939f70d2bcb3db8412b72ccc237ebf63564b9bd9e9e26613e75fc0c2bdf3f9965ca0b96707db1130f35edfd93e475b7825bf7b9b
+  data.tar.gz: 27df1992ff07455872730e2d7d65638b4b63ee1670d4cddfe940de8f17ee27df002db0fba0b0086ea0da6bafedfdbfaea11f6c4acbc7671b9d95a9999600a057

data/deploy.sh

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

data/lib/backburner/allq_wrapper.rb

@@ -219,9 +219,6 @@ module Backburner
 
       begin
         Timeout.timeout(10) do
-          if body && body.to_s.include?('["default"]')
-          end
-
           if is_parent
             new_job = build_new_parent_job(body, options)
             result = @client.parent_job_post(new_job)
@@ -232,18 +229,18 @@ module Backburner
           raise 'PUT returned nil' if result.nil? || result.to_s == ''
         end
       rescue Timeout::Error
-        puts('ALLQ_PUT_TIMEOUT')
+        puts('ALLQ PUT timeout, retrying...')
         sleep(5)
         retry_count += 1
         retry if retry_count < 4
-        raise 'Failed to put on allq, we are investigating the problem, please try again'
+        raise "Failed to put on allq, we are investigating the problem, please try again -> #{body}"
       rescue StandardError => e
-        puts('Failed to ALLQ PUT')
+        puts('Failed to ALLQ PUT, retrying...')
         puts(e)
         retry_count += 1
         sleep(5)
         retry if retry_count < 4
-        raise 'Failed to put on allq, we are investigating the problem, please try again'
+        raise "Failed to put on allq, we are investigating the problem, please try again: #{body}"
       end
       result
     end

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "1.0.33"
+  VERSION = "1.0.36"
 end

data/lib/backburner/worker.rb

@@ -23,7 +23,13 @@ module Backburner
     # @example
     #   Backburner::Worker.enqueue NewsletterSender, [self.id, user.id], :ttr => 1000
     #
-    def self.enqueue(job_class, args=[], opts={})
+    def self.enqueue(job_class, args = [], opts = {})
+      # Invoke Procs if they are sent
+      opts.each_key do |k|
+        opts[k] = opts[k].call job_class, args if opts[k].instance_of?(Proc)
+      end
+
+      opts[:shard_key] = opts[:shard_key].nil? ? 'X' : opts[:shard_key].to_s
       pri   = resolve_priority(opts[:pri] || job_class)
       delay = [0, opts[:delay].to_i].max
       ttr   = resolve_respond_timeout(opts[:ttr] || job_class)
@@ -76,7 +82,7 @@ module Backburner
     #
     # @example
     #   Worker.new(['test.job'])
-    def initialize(tube_names=nil)
+    def initialize(tube_names = nil)
       @connection = new_connection
       @tube_names = self.process_tube_names(tube_names)
       register_signal_handlers!

data/lib/backburner/workers/threads_on_fork.rb

@@ -221,7 +221,7 @@ module Backburner
       end
 
       def on_reconnect(conn)
-        watch_tube(@watching_tube, conn) if @watching_tube
+        watch_tube(@watched_tube_name, conn) if @watched_tube_name
       end
 
       # Exit with Kernel.exit! to avoid at_exit callbacks that should belongs to

data/lib/backburner.rb

@@ -10,8 +10,8 @@ require 'backburner/logger'
 require 'backburner/connection'
 require 'backburner/hooks'
 require 'backburner/performable'
-require 'backburner/worker'
-require 'backburner/workers/simple'
+require_relative 'backburner/worker'
+require_relative 'backburner/workers/simple'
 require 'backburner/workers/forking'
 require 'backburner/workers/threads_on_fork'
 require 'backburner/workers/threading'

data/test/performable_test.rb

@@ -29,15 +29,15 @@ describe "Backburner::Performable module" do
 
   describe "for async instance method" do
     it "should invoke worker enqueue" do
-      Backburner::Worker.expects(:enqueue).with(PerformableTestObj, [56, :foo, true, false], has_entries(:pri => 5000, :queue => "foo"))
-      PerformableTestObj.new.async(:pri => 5000, :queue => "foo").foo(true, false)
+      Backburner::Worker.expects(:enqueue).with(PerformableTestObj, [56, :foo, true, false], has_entries(:pri => 5000, :queue => "foo", :shard_key => "abc"))
+      PerformableTestObj.new.async(:pri => 5000, :queue => "foo", :shard_key => "abc").foo(true, false)
     end
   end # async instance
 
   describe "for async class method" do
     it "should invoke worker enqueue" do
-      Backburner::Worker.expects(:enqueue).with(PerformableTestObj, [nil, :bar, true, false], has_entries(:pri => 5000, :queue => "foo"))
-      PerformableTestObj.async(:pri => 5000, :queue => "foo").bar(true, false)
+      Backburner::Worker.expects(:enqueue).with(PerformableTestObj, [nil, :bar, true, false], has_entries(:pri => 5000, :queue => "foo", :shard_key => "abc"))
+      PerformableTestObj.async(:pri => 5000, :queue => "foo", :shard_key => "abc").bar(true, false)
     end
   end # async class
 
@@ -53,16 +53,16 @@ describe "Backburner::Performable module" do
 
   describe "for handle_asynchronously class method" do
     it "should automagically asynchronously proxy calls to the method" do
-      Backburner::Performable.handle_asynchronously(AutomagicTestObj, :qux, :pri => 5000, :queue => "qux")
+      Backburner::Performable.handle_asynchronously(AutomagicTestObj, :qux, :pri => 5000, :queue => "qux", :shard_key => "abc")
 
-      Backburner::Worker.expects(:enqueue).with(AutomagicTestObj, [56, :qux_without_async, true, false], has_entries(:pri => 5000, :queue => "qux"))
+      Backburner::Worker.expects(:enqueue).with(AutomagicTestObj, [56, :qux_without_async, true, false], has_entries(:pri => 5000, :queue => "qux", :shard_key => "abc"))
       AutomagicTestObj.new.qux(true, false)
     end
 
     it "should work for class methods, too" do
-      Backburner::Performable.handle_static_asynchronously(AutomagicTestObj, :garply, :pri => 5000, :queue => "garply")
+      Backburner::Performable.handle_static_asynchronously(AutomagicTestObj, :garply, :pri => 5000, :queue => "garply", :shard_key => "abc")
 
-      Backburner::Worker.expects(:enqueue).with(AutomagicTestObj, [nil, :garply_without_async, true, false], has_entries(:pri => 5000, :queue => "garply"))
+      Backburner::Worker.expects(:enqueue).with(AutomagicTestObj, [nil, :garply_without_async, true, false], has_entries(:pri => 5000, :queue => "garply", :shard_key => "abc"))
       AutomagicTestObj.garply(true, false)
     end
 
@@ -74,14 +74,14 @@ describe "Backburner::Performable module" do
     end
 
     it "should be available for instance methods on any class that includes the Performable module" do
-      AsyncInstanceMethodsTestObj.handle_asynchronously :foo, pri: 5000, queue: 'qux'
-      Backburner::Worker.expects(:enqueue).with(AsyncInstanceMethodsTestObj, [56, :foo_without_async, true, false], has_entries(:pri => 5000, :queue => "qux"))
+      AsyncInstanceMethodsTestObj.handle_asynchronously :foo, pri: 5000, queue: 'qux', shard_key: "abc"
+      Backburner::Worker.expects(:enqueue).with(AsyncInstanceMethodsTestObj, [56, :foo_without_async, true, false], has_entries(:pri => 5000, :queue => "qux", :shard_key => "abc"))
       AsyncInstanceMethodsTestObj.new.foo(true, false)
     end
 
     it "should be available for class methods on any class that includes the Performable module" do
-      AsyncStaticMethodsTestObj.handle_static_asynchronously :bar, pri: 5000, queue: 'garply'
-      Backburner::Worker.expects(:enqueue).with(AsyncStaticMethodsTestObj, [nil, :bar_without_async, true, false], has_entries(:pri => 5000, :queue => "garply"))
+      AsyncStaticMethodsTestObj.handle_static_asynchronously :bar, pri: 5000, queue: 'garply', shard_key: "abc"
+      Backburner::Worker.expects(:enqueue).with(AsyncStaticMethodsTestObj, [nil, :bar_without_async, true, false], has_entries(:pri => 5000, :queue => "garply",:shard_key => "abc"))
       AsyncStaticMethodsTestObj.bar(true, false)
     end
   end

data/test/test_helper.rb

@@ -12,7 +12,7 @@ require File.expand_path('../helpers/templogger', __FILE__)
 
 # Configure Backburner
 Backburner.configure do |config|
-  config.beanstalk_url = "beanstalk://127.0.0.1"
+  config.allq_url = "allq://127.0.0.1:8091"
   config.tube_namespace = "demo.test"
 end
 
@@ -88,7 +88,7 @@ class MiniTest::Spec
   end
 
   def beanstalk_connection
-    Backburner::Connection.new(Backburner.configuration.beanstalk_url)
+    Backburner::Connection.new(Backburner.configuration.allq_url)
   end
 
   # pop_one_job(tube_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.36
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allq_rest