kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases 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 @@ module ActiveRecord
# Is there an open connection that is being used for the current thread? # 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 # #connection or #with_connection methods, connections obtained through
# #checkout will not be detected by #active_connection? # #checkout will not be detected by #active_connection?
def active_connection? def active_connection?
@ -427,7 +427,7 @@ module ActiveRecord
# The pool first tries to gain ownership of all connections, if unable to # The pool first tries to gain ownership of all connections, if unable to
# do so within a timeout interval (default duration is # do so within a timeout interval (default duration is
# +spec.config[:checkout_timeout] * 2+ seconds), the pool is forcefully # +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! def disconnect!
disconnect(false) disconnect(false)
end end