TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #21637 from amitsuroliya/doc_fixes

Browse Source 
Improved ActiveRecord Connection Pool docs [ci skip]
This commit is contained in:
Kasper Timm Hansen 2015-09-17 08:51:18 +02:00
commit 1ebd987aeb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,7 +364,7 @@ def connection
# Is there an open connection that is being used for the current thread?
#
# This method only works for connections that have been abtained through
# This method only works for connections that have been obtained through
# #connection or #with_connection methods, connections obtained through
# #checkout will not be detected by #active_connection?
def active_connection?
@ -427,7 +427,7 @@ def disconnect(raise_on_acquisition_timeout = true)
# The pool first tries to gain ownership of all connections, if unable to
# do so within a timeout interval (default duration is
# +spec.config[:checkout_timeout] * 2+ seconds), the pool is forcefully
# disconneted wihout any regard for other connection owning threads.
# disconnected without any regard for other connection owning threads.
def disconnect!
disconnect(false)
end