Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

connections can be removed from the pool

  • Loading branch information...
commit 17ff88c4d425d7b55ff1a1225cb56f293e7dd7eb 1 parent bf9e6c7
@tenderlove tenderlove authored
View
10 activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -59,7 +59,7 @@ module ConnectionAdapters
class ConnectionPool
include MonitorMixin
- attr_accessor :automatic_reconnect
+ attr_accessor :automatic_reconnect, :timeout
attr_reader :spec, :connections
# Creates a new ConnectionPool object. +spec+ is a ConnectionSpecification
@@ -217,6 +217,14 @@ def checkin(conn)
end
end
+ # Remove a connection from the connection pool. The connection will
+ # remain open and active but will no longer be managed by this pool.
+ def remove(conn)
+ synchronize do
+ @connections.delete conn
+ end
+ end
+
private
def new_connection
View
19 activerecord/test/cases/connection_pool_test.rb
@@ -4,6 +4,8 @@ module ActiveRecord
module ConnectionAdapters
class ConnectionPoolTest < ActiveRecord::TestCase
def setup
+ super
+
# Keep a duplicate pool so we do not bother others
@pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
@@ -18,6 +20,23 @@ def setup
end
end
+ def teardown
+ super
+ @pool.connections.each(&:close)
+ end
+
+ def test_remove_connection
+ conn = @pool.checkout
+ assert conn.in_use?
+
+ length = @pool.connections.length
+ @pool.remove conn
+ assert conn.in_use?
+ assert_equal(length - 1, @pool.connections.length)
+ ensure
+ conn.close
+ end
+
def test_active_connection?
assert !@pool.active_connection?
assert @pool.connection
Please sign in to comment.
Something went wrong with that request. Please try again.