Merge branch 'master' of github.com:mperham/connection_pool

README.md

@@ -68,6 +68,19 @@ end
 Once you've ported your entire system to use `with`, you can simply remove
 `Wrapper` and use the simpler and faster `ConnectionPool`.
 
+You can shut down a ConnectionPool instance once it should no longer be used.
+Further checkout attempts will immediately raise an error but existing checkouts
+will work.
+
+```ruby
+cp = ConnectionPool.new { Redis.new }
+cp.shutdown { |conn| conn.close }
+```
+
+Shutting down a connection pool will block until all connections are checked in and closed.
+Note that shutting down is completely optional; Ruby's garbage collector will reclaim
+unreferenced pools under normal circumstances.
+
 
 Notes
 -----

lib/connection_pool.rb

@@ -66,7 +66,7 @@ class ConnectionPool
 
     if stack.empty?
       timeout = options[:timeout] || @timeout
-      conn = @available.pop(timeout)
+      conn = @available.pop(timeout: timeout)
     else
       conn = stack.last
     end

lib/connection_pool/timed_stack.rb

@@ -1,10 +1,37 @@
 require 'thread'
 require 'timeout'
 
+##
+# Raised when you attempt to retrieve a connection from a pool that has been
+# shut down.
+
 class ConnectionPool::PoolShuttingDownError < RuntimeError; end
 
+##
+# The TimedStack manages a pool of homogeneous connections (or any resource
+# you wish to manage).  Connections are created lazily up to a given maximum
+# number.
+
+# Examples:
+#
+#    ts = TimedStack.new(1) { MyConnection.new }
+#
+#    # fetch a connection
+#    conn = ts.pop
+#
+#    # return a connection
+#    ts.push conn
+#
+#    conn = ts.pop
+#    ts.pop timeout: 5
+#    #=> raises Timeout::Error after 5 seconds
+
 class ConnectionPool::TimedStack
 
+  ##
+  # Creates a new pool with +size+ connections that are created from the given
+  # +block+.
+
   def initialize(size = 0, &block)
     @create_block = block
     @created = 0
@@ -15,12 +42,16 @@ class ConnectionPool::TimedStack
     @shutdown_block = nil
   end
 
-  def push(obj)
+  ##
+  # Returns +obj+ to the stack.  +options+ is ignored in TimedStack but may be
+  # used by subclasses that extend TimedStack.
+
+  def push(obj, options = {})
     @mutex.synchronize do
       if @shutdown_block
         @shutdown_block.call(obj)
       else
-        @que.push obj
+        store_connection obj, options
       end
 
       @resource.broadcast
@@ -28,16 +59,28 @@ class ConnectionPool::TimedStack
   end
   alias_method :<<, :push
 
-  def pop(timeout=0.5)
+  ##
+  # Retrieves a connection from the stack.  If a connection is available it is
+  # immediately returned.  If no connection is available within the given
+  # timeout a Timeout::Error is raised.
+  #
+  # +:timeout+ is the only checked entry in +options+ and is preferred over
+  # the +timeout+ argument (which will be removed in a future release).  Other
+  # options may be used by subclasses that extend TimedStack.
+
+  def pop(timeout = 0.5, options = {})
+    options, timeout = timeout, 0.5 if Hash === timeout
+    timeout = options.fetch :timeout, timeout
+
     deadline = Time.now + timeout
     @mutex.synchronize do
       loop do
         raise ConnectionPool::PoolShuttingDownError if @shutdown_block
-        return @que.pop unless @que.empty?
-        unless @created == @max
-          @created += 1
-          return @create_block.call
-        end
+        return fetch_connection(options) if connection_stored?(options)
+
+        connection = try_create(options)
+        return connection if connection
+
         to_wait = deadline - Time.now
         raise Timeout::Error, "Waited #{timeout} sec" if to_wait <= 0
         @resource.wait(@mutex, to_wait)
@@ -45,6 +88,10 @@ class ConnectionPool::TimedStack
     end
   end
 
+  ##
+  # Shuts down the TimedStack which prevents connections from being checked
+  # out.  The +block+ is called once for each connection on the stack.
+
   def shutdown(&block)
     raise ArgumentError, "shutdown must receive a block" unless block_given?
 
@@ -52,18 +99,75 @@ class ConnectionPool::TimedStack
       @shutdown_block = block
       @resource.broadcast
 
-      @que.size.times do
-        conn = @que.pop
-        block.call(conn)
-      end
+      shutdown_connections
     end
   end
 
+  ##
+  # Returns +true+ if there are no available connections.
+
   def empty?
     (@created - @que.length) >= @max
   end
 
+  ##
+  # The number of connections available on the stack.
+
   def length
     @max - @created + @que.length
   end
+
+  private
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must returns true if a connection is available on the stack.
+
+  def connection_stored?(options = nil)
+    !@que.empty?
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must return a connection from the stack.
+
+  def fetch_connection(options = nil)
+    @que.pop
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must shut down all connections on the stack.
+
+  def shutdown_connections(options = nil)
+    while connection_stored?(options)
+      conn = fetch_connection(options)
+      @shutdown_block.call(conn)
+    end
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must return +obj+ to the stack.
+
+  def store_connection(obj, options = nil)
+    @que.push obj
+  end
+
+  ##
+  # This is an extension point for TimedStack and is called with a mutex.
+  #
+  # This method must create a connection if and only if the total number of
+  # connections allowed has not been met.
+
+  def try_create(options = nil)
+    unless @created == @max
+      @created += 1
+      @create_block.call
+    end
+  end
 end

test/test_connection_pool_timed_stack.rb

@@ -44,6 +44,14 @@ class TestConnectionPoolTimedStack < Minitest::Test
   end
 
   def test_pop_empty
+    e = assert_raises Timeout::Error do
+      @stack.pop timeout: 0
+    end
+
+    assert_equal 'Waited 0 sec', e.message
+  end
+
+  def test_pop_empty_2_0_compatibility
     e = assert_raises Timeout::Error do
       @stack.pop 0
     end