github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start implementing @reserved_connections in terms of connection leases.

Browse Source
This commit is contained in:
Aaron Patterson
2011-11-29 13:56:24 -08:00
parent 5725e397fe
commit ce3d8d646a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
View File

@@ -97,7 +97,7 @@ module ActiveRecord
# Check to see if there is an active connection in this connection
# pool.
def active_connection?
@reserved_connections.key? current_connection_id
active_connections.any?
end
# Signal that the thread is finished with the current connection.
@@ -113,7 +113,7 @@ module ActiveRecord
# connection when finished.
def with_connection
connection_id = current_connection_id
fresh_connection = true unless @reserved_connections[connection_id]
fresh_connection = true unless active_connection?
yield connection
ensure
release_connection(connection_id) if fresh_connection
@@ -121,7 +121,7 @@ module ActiveRecord
# Returns true if a connection has already been opened.
def connected?
!@connections.empty?
@connections.any?
end
# Disconnects all connections in the pool, and clears the pool.