don't need a separate redis connection for MultiQueue if we have a Redis connection pool

Author: Aaron Patterson and Terence Lee

lib/resque/multi_queue.rb

@@ -11,17 +11,18 @@ class MultiQueue
 
     ###
     # Create a new MultiQueue using the +queues+ from the +redis+ connection
-    def initialize(queues, redis, pool = Resque.pool)
+    def initialize(queues, pool = Resque.pool)
       super()
 
       @queues     = queues # since ruby 1.8 doesn't have Ordered Hashes
       @queue_hash = {}
-      @redis      = redis
       @pool       = pool
+      @pool.with_connection { |redis|
+        @namespace = redis.is_a?(Redis::Namespace) ? redis.namespace : nil
+      }
 
       queues.each do |queue|
-        key = @redis.is_a?(Redis::Namespace) ? "#{@redis.namespace}:" : ""
-        key += queue.redis_name
+        key = [@namespace, queue.redis_name].compact.join(':')
         @queue_hash[key] = queue
 
       end
@@ -52,7 +53,7 @@ def pop(non_block = false)
           synchronize do
             value = @pool.with_connection {|pool| pool.blpop(*(queue_names + [:timeout => 1])) } until value
             queue_name, payload = value
-            queue = @queue_hash["#{@redis.namespace}:#{queue_name}"]
+            queue = @queue_hash["#{@namespace}:#{queue_name}"]
             [queue, queue.decode(payload)]
           end
         else
@@ -72,7 +73,8 @@ def poll(timeout)
         return unless payload
 
         synchronize do
-          queue = @queue_hash["#{@redis.namespace}:#{queue_name}"]
+          key = [@namespace, queue_name].compact.join ':'
+          queue = @queue_hash[key]
           [queue, queue.decode(payload)]
         end
       else

lib/resque/worker.rb

@@ -207,7 +207,7 @@ def perform(job)
     def reserve(interval = 5.0)
       interval = interval.to_i
       multi_queue = MultiQueue.new(
-        queues.map {|queue| Queue.new(queue, Resque.pool, Resque.coder) }, Resque.redis,
+        queues.map {|queue| Queue.new(queue, Resque.pool, Resque.coder) },
         Resque.pool)
 
       if interval < 1

test/multi_queue_test.rb

@@ -1,26 +1,25 @@
 require "test_helper"
 
 describe "Resque::MultiQueue" do
-  let(:redis) { Resque.redis }
   let(:pool)  { Resque.pool }
   let(:coder) { Resque::JsonCoder.new }
 
   it "poll times out and returns nil" do
     foo   = Resque::Queue.new 'foo', pool
     bar   = Resque::Queue.new 'bar', pool
-    queue = Resque::MultiQueue.new([foo, bar], redis, pool)
+    queue = Resque::MultiQueue.new([foo, bar], pool)
     assert_nil queue.poll(1)
   end
 
   it "poll is a no-op when queues are empty" do
-    queue = Resque::MultiQueue.new([], redis)
+    queue = Resque::MultiQueue.new([])
     assert_nil queue.poll(1)
   end
 
   it "blocks on pop" do
     foo   = Resque::Queue.new 'foo', pool, coder
     bar   = Resque::Queue.new 'bar', pool, coder
-    queue = Resque::MultiQueue.new([foo, bar], redis, pool)
+    queue = Resque::MultiQueue.new([foo, bar], pool)
     t     = Thread.new { queue.pop }
 
     job = { 'class' => 'GoodJob', 'args' => [35, 'tar'] }
@@ -32,7 +31,7 @@
   it "nonblocking pop works" do
     foo   = Resque::Queue.new 'foo', pool, coder
     bar   = Resque::Queue.new 'bar', pool, coder
-    queue = Resque::MultiQueue.new([foo, bar], redis, pool)
+    queue = Resque::MultiQueue.new([foo, bar], pool)
 
     job = { 'class' => 'GoodJob', 'args' => [35, 'tar'] }
     bar << job
@@ -43,7 +42,7 @@
   it "nonblocking pop doesn't block" do
     foo   = Resque::Queue.new 'foo', pool, coder
     bar   = Resque::Queue.new 'bar', pool, coder
-    queue = Resque::MultiQueue.new([foo, bar], redis, pool)
+    queue = Resque::MultiQueue.new([foo, bar], pool)
 
     assert_raises ThreadError do
       queue.pop(true)
@@ -53,7 +52,7 @@
   it "blocks forever on pop" do
     foo   = Resque::Queue.new 'foo', pool, coder
     bar   = Resque::Queue.new 'bar', pool, coder
-    queue = Resque::MultiQueue.new([foo, bar], redis, pool)
+    queue = Resque::MultiQueue.new([foo, bar], pool)
     assert_raises Timeout::Error do
       Timeout::timeout(2) { queue.pop }
     end
@@ -64,7 +63,7 @@
     bar    = Resque::Queue.new 'bar', pool, coder
     baz    = Resque::Queue.new 'baz', pool, coder
     queues = [foo, bar, baz]
-    queue  = Resque::MultiQueue.new(queues, redis, pool)
+    queue  = Resque::MultiQueue.new(queues, pool)
     job    = { 'class' => 'GoodJob', 'args' => [35, 'tar'] }
 
     queues.each {|q| q << job }
@@ -82,7 +81,7 @@
     bar    = Resque::Queue.new 'bar', pool, coder
     baz    = Resque::Queue.new 'baz', pool, coder
     queues = [foo, bar, baz]
-    queue  = Resque::MultiQueue.new(queues, redis, pool)
+    queue  = Resque::MultiQueue.new(queues, pool)
     job    = { 'class' => 'GoodJob', 'args' => [35, 'tar'] }
 
     queues.each {|q| q << job }
@@ -96,7 +95,7 @@
   end
 
   it "blocking pop is a no-op if queues are empty" do
-    queue = Resque::MultiQueue.new([], redis)
+    queue = Resque::MultiQueue.new([])
     assert_raises Timeout::Error do
       Timeout.timeout(2) { queue.pop }
     end