connection pool will reuse conns first before creating a new one

Author: hone

lib/resque/connection_pool.rb

@@ -20,10 +20,11 @@ def checkout
         Timeout.timeout(@timeout) do
           @cv.wait_while { checked_out_conns.length >= @size }
         end
-        if conns.size < @size
+        available_conns = conns.find {|k, v| !v }
+        if conns.size < @size && available_conns.nil?
           conn = Resque.create_connection(@url)
         else
-          conn = conns.find {|k, v| !v }.first
+          conn = available_conns.first
         end
         conns[conn] = true
       end

test/connection_pool_test.rb

@@ -113,5 +113,13 @@ def method_missing(meth, *args, &block)
         refute_equal "fatal", e.class.to_s, e.message
       end
     end
+
+    it "reuse existing connections first if available" do
+      cp   = ConnectionPool.new(REDIS_URL, 2)
+      conn = nil
+      cp.with_connection {|c| conn = c }
+
+      assert_equal conn, cp.checkout, "Does not use the same connection"
+    end
   end
 end