backburner-allq 1.0.9 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 252fc4e5aa793b391b70aa0d4947d88c7d3c1ad3df7807824a9b7c351937caff
-  data.tar.gz: b1f459dc189399a59d26bebae015b10377916fd250edf66a987cbb8bcb264ca6
+  metadata.gz: 0aea14c4ca2fa04f46e103f147d265c60a79cbcfab02c76ab5cfc333683cbbf3
+  data.tar.gz: '08768dfb235b89694e401a67e20f963ec0bff7f9bdbaaceb178e7995e884d7cd'
 SHA512:
-  metadata.gz: 8ce217f35c0b62b80e707264c253a479e828f0d5a075b145c63d558c4f525d1928d6fbb0f4e247adcff71fe398bec213ecbf75d67ae83c3794413f49b2832cec
-  data.tar.gz: 4229e711046a0f055fda7992708be107e1e53d6dc9eca834bfade289734188d46b7e86c13d567eec14bce6fcd263943f9c7e6202e4ab2c254759ee34ec8b80da
+  metadata.gz: e43b3ae23ce17153380d0b2d03ff98344dabb2002e287edde44b3d878b08989671391d29ed8617c756a296f07962ebb4580421bb826a7ad7a2b2e30bd26e9bf7
+  data.tar.gz: d8ae8904ede1db1c330674134a4301b1658b98bb69a268fbe20fda986590b29747216ea40e68d287979f9fa2f6439e727e95432927fe35a86c74897d9ba4c0d3

data/deploy.sh

@@ -1,3 +1,3 @@
 echo "Did you update the version?"
 gem build backburner-allq.gemspec
-gem push backburner-allq-1.0.9.gem
+gem push backburner-allq-1.0.16.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
@@ -114,13 +116,19 @@ module Backburner
       @client.release_put(job.id)
     end
 
-    def bury(job); end
+    def bury(job)
+     @client.bury_put(job.id)
+    end
 
     def tube_names
       stats_hash = stats
       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)
@@ -161,15 +169,8 @@ module Backburner
 
       default = 5
 
-      return default if app_priority == 32_000
-
-      return 6 if app_priority >= 33_000
-
-      return 7 if app_priority >= 35_000
-
-      return 8 if app_priority >= 37_000
-
-      default
+      # return app_priority unless larger than 10
+      app_priority > 10 ? 5 : app_priority
     end
 
     def log_result(job_result)
@@ -191,6 +192,7 @@ module Backburner
                                  ttl: ttl,
                                  delay: delay,
                                  priority: adjusted_priority,
+                                 shard_key: options[:shard_key],
                                  parent_id: parent_id)
       new_job
     end
@@ -212,21 +214,11 @@ module Backburner
                                               priority: adjusted_priority,
                                               timeout: timeout,
                                               run_on_timeout: run_on_timeout,
+                                              shard_key: options[:shard_key],
                                               limit: limit)
       new_parent_job
     end
 
-    def put2(body, pri = 5, ttl = 600, tube_name = "default", delay = 0)
-      # Old school way
-      options = {
-        pri: pri,
-        ttl: ttl,
-        tube_name: tube_name,
-        delay: delay
-      }
-      put(body, options)
-    end
-
     def put(body, options)
       # New school put
       retry_count = 0
@@ -236,7 +228,6 @@ module Backburner
       begin
         Timeout.timeout(10) do
           if body && body.to_s.include?('["default"]')
-            puts "PUTTING DEFAULT! #{caller.inspect}"
           end
 
           if is_parent
@@ -265,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/connection.rb

@@ -96,9 +96,17 @@ module Backburner
 
     def put(tube_name, data, opt)
       pri = (opt[:pri] || 5).to_i
-      delay = opt[:delay].to_i
       ttr = (opt[:ttr] || 600).to_i
-      @allq_wrapper.put2(data, pri, ttr, tube_name, delay)
+
+      options = {
+        tube_name: tube_name,
+        pri: pri,
+        delay: opt[:delay].to_i,
+        ttr: ttr
+      }
+
+      options.merge!(opt)
+      @allq_wrapper.put(data, options)
     end
 
     def get(tube_name)

data/lib/backburner/version.rb

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

data/lib/backburner/worker.rb

@@ -40,8 +40,7 @@ module Backburner
         connection.retryable do
           tube_name = expand_tube_name(queue || job_class)
           serialized_data = Backburner.configuration.job_serializer_proc.call(data)
-          puts "Tube name #{tube_name}"
-          response = connection.put(tube_name, serialized_data, :pri => pri, :delay => delay, :ttr => ttr)
+          response = connection.put(tube_name, serialized_data, :pri => pri, :delay => delay, :ttr => ttr, :shard_key => opts[:shard_key])
         end
         return nil unless Backburner::Hooks.invoke_hook_events(job_class, :after_enqueue, *args)
       ensure

metadata

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