MultiQueue#pop returns the Queue object as well

Author: hone

lib/resque/multi_queue.rb

@@ -25,7 +25,7 @@ def initialize(queues, redis)
     end
 
     # Pop an item off one of the queues.  This method will block until an item
-    # is available.
+    # is available. This method returns a tuple of the queue object and job.
     #
     # Pass +true+ for a non-blocking pop.  If nothing is read on a non-blocking
     # pop, a ThreadError is raised.
@@ -36,7 +36,7 @@ def pop(non_block = false)
 
           @queues.values.each do |queue|
             begin
-              return queue.pop(true)
+              return [queue, queue.pop(true)]
             rescue ThreadError
             end
           end
@@ -48,7 +48,8 @@ def pop(non_block = false)
         synchronize do
           value = @redis.blpop(*(queue_names + [1])) until value
           queue_name, payload = value
-          @queues[queue_name].decode(payload)
+          queue = @queues[queue_name]
+          [queue, queue.decode(payload)]
         end
       end
     end

test/multi_queue_test.rb

@@ -16,7 +16,8 @@
 
     job = { 'class' => 'GoodJob', 'args' => [35, 'tar'] }
     bar << job
-    assert_equal job, t.join.value
+
+    assert_equal [bar, job], t.join.value
   end
 
   it "nonblocking pop works" do
@@ -26,7 +27,8 @@
 
     job = { 'class' => 'GoodJob', 'args' => [35, 'tar'] }
     bar << job
-    assert_equal job, queue.pop(true)
+
+    assert_equal [bar, job], queue.pop(true)
   end
 
   it "blocks forever on pop" do