diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-17 08:51:18 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-17 08:51:18 +0200 |
| commit | 1ebd987aeba95ee65fc2647581fb87fed55a0a23 (patch) | |
| tree | bcf11615d361c83d1a06a6904b6e1354267d0662 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | 79b201e4e3304c269b90b2241724fd7593c0998d (diff) | |
| parent | 3b52d5013b329f47175ead82ebeb44362f511d7a (diff) | |
| download | rails-1ebd987aeba95ee65fc2647581fb87fed55a0a23.tar.gz rails-1ebd987aeba95ee65fc2647581fb87fed55a0a23.tar.bz2 rails-1ebd987aeba95ee65fc2647581fb87fed55a0a23.zip | |
Merge pull request #21637 from amitsuroliya/doc_fixes
Improved ActiveRecord Connection Pool docs [ci skip]
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index d6044f6cfd..6544b64f52 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -364,7 +364,7 @@ module ActiveRecord # 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 @@ module ActiveRecord # 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 |