backburner-allq 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961c84a21c68a6bbe287105030dcbcf73e50177d647321dc410786b417ba653c
-  data.tar.gz: bee092eb96d993ee4b34b4c1e9fa671cc92e4a3316179890be130dbe14cc70f1
+  metadata.gz: ed4aae689c12e639f2f51a32aef5a59c80f0ab452f89fe2f29afb566474ba201
+  data.tar.gz: 62e79b474949889a1b992b7fa25a034a1c87a62d1d6db0ba5f8a01582e464071
 SHA512:
-  metadata.gz: a09fd305b986a90330434db34e13e961f4f6878bff406348fb246f03ac0a3e0b9b8216862128c62005e5b25a4338371cb341e57133aadaa1e3187066fee8698e
-  data.tar.gz: 12fd13a7430682a5021d16ad32c7f3be1f39767413feeb2a96a7335c465d3639dfbd47905f43249aae27d23030c27a284fce36d098f7b6f396ac789182330efe
+  metadata.gz: 8f5e2bd1006d8d39e95f25b85b195ad7b8cefd5b77a16dd93ab095ef0ca080d90e04b63490e66d9247b47e9f97d2355e5b2fa9fe03b2c85dd413efa54d642a32
+  data.tar.gz: 26a7b05894906fc6d79f0e98b6bed0f67d5ea8c62b09c3b6b89acb89fb13811dc568353ce7432d89081ed79ff97f4f2da5c91ee5e20ba2131cddf10a875da7c0

data/deploy.sh

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

data/lib/backburner/configuration.rb

@@ -22,7 +22,7 @@ module Backburner
 
     def initialize
       @allq_url       = "allq://127.0.0.1:8091"
-      @tube_namespace      = "backallq"
+      @tube_namespace      = "backburner"
       @namespace_separator = "."
       @default_priority    = 5
       @respond_timeout     = 120

data/lib/backburner/version.rb

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

data/lib/backburner/worker.rb

@@ -126,9 +126,14 @@ module Backburner
     # @example
     #   @worker.work_one_job
     # @raise [Beaneater::NotConnected] If beanstalk fails to connect multiple times.
-    def work_one_job(conn = connection)
+    def work_one_job(conn = connection, tube_name = nil)
+      if tube_name.nil?
+        self.log_error "Sampling tube, this is bad practice for Allq"
+        tube_name = @tube_names.sample 
+      end
+      
       begin
-        job = reserve_job(conn)
+        job = reserve_job(conn, tube_name)
       rescue Exception => e
         self.log_error "Sleeping"
         self.log_error "Exception: #{e.full_message}"
@@ -158,8 +163,6 @@ module Backburner
           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
-          puts "num_retries = #{num_retries}"
-          puts "max_job_retries = #{max_job_retries}"
           
           if num_retries + 1 > max_job_retries
             job.bury
@@ -185,8 +188,8 @@ module Backburner
     end
 
     # Reserve a job from the watched queues
-    def reserve_job(conn, reserve_timeout = Backburner.configuration.reserve_timeout)
-      job = conn.get(@tube_names.sample)
+    def reserve_job(conn, tube_name, reserve_timeout = Backburner.configuration.reserve_timeout)
+      job = conn.get(tube_name)
       return nil if job.nil? || job.body == nil?
       Backburner::Job.new(job)
     end

data/lib/backburner/workers/threading.rb

@@ -58,7 +58,7 @@ module Backburner
               loop do
                 begin
                   break if @in_shutdown
-                  work_one_job(memo_connection)
+                  work_one_job(memo_connection, tube_name)
                 rescue => e
                   log_error("Exception caught in thread pool loop. Continuing. -> #{e.message}\nBacktrace: #{e.backtrace}")
                 end

data/lib/backburner/workers/threads_on_fork.rb

@@ -210,7 +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)
+          ran_job = work_one_job(conn, @watched_tube_name)
           # Wait a second if we didn't find a job
           unless ran_job
             puts "sleeping"
@@ -221,6 +221,7 @@ module Backburner
 
       # Shortcut for watching a tube on our beanstalk connection
       def watch_tube(name, conn = connection)
+        @watched_tube_name = name
         # No op for allq
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Jason Malcolm