call blpop correctly

Author: Aaron Patterson and Terence Lee

lib/resque/multi_queue.rb

@@ -45,7 +45,7 @@ def pop(non_block = false)
       else
         queue_names = @queues.map {|queue| queue.redis_name }
         synchronize do
-          value = @pool.with_connection {|pool| pool.blpop(*(queue_names + [1])) } until value
+          value = @pool.with_connection {|pool| pool.blpop(*(queue_names + [:timeout => 1])) } until value
           queue_name, payload = value
           queue = @queue_hash[queue_name]
           [queue, queue.decode(payload)]
@@ -59,7 +59,7 @@ def pop(non_block = false)
     # the timeout expires.
     def poll(timeout)
       queue_names = @queues.map {|queue| queue.redis_name }
-      queue_name, payload = @pool.with_connection {|pool| pool.blpop(*(queue_names + [timeout])) }
+      queue_name, payload = @pool.with_connection {|pool| pool.blpop(*(queue_names + [:timeout => timeout])) }
       return unless payload
 
       synchronize do

lib/resque/queue.rb

@@ -73,7 +73,7 @@ def pop non_block = false
         raise ThreadError unless value
         synchronize {decode value }
       else
-        value = @pool.with_connection {|pool| pool.blpop(@redis_name, 1) } until value
+        value = @pool.with_connection {|pool| pool.blpop(@redis_name, :timeout => 1) } until value
         synchronize {decode value.last }
       end
     end
@@ -83,7 +83,7 @@ def pop non_block = false
     # Blocks for +timeout+ seconds if the queue is empty, and returns nil if
     # the timeout expires.
     def poll(timeout)
-      queue_name, payload = @pool.with_connection {|pool| pool.blpop(@redis_name, timeout) }
+      queue_name, payload = @pool.with_connection {|pool| pool.blpop(@redis_name, :timeout => timeout) }
       return unless payload
 
       synchronize do