diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-12 09:45:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-12 09:45:33 -0700 |
| commit | 2b0558585fa495e61e67f4226aa3ba2eb7771106 (patch) | |
| tree | 7d32322eb9e632d5f3abb9737d881be449b708b7 | |
| parent | ca99beb4a9fc983603e2427255afa97c63cc4cfc (diff) | |
| parent | 27ebb3dc8cb57d17a2ef7aa0e358489bc7bf4c86 (diff) | |
| download | rails-2b0558585fa495e61e67f4226aa3ba2eb7771106.tar.gz rails-2b0558585fa495e61e67f4226aa3ba2eb7771106.tar.bz2 rails-2b0558585fa495e61e67f4226aa3ba2eb7771106.zip | |
Merge pull request #5393 from jrochkind/clear_to_reap
deprecated clear_stale_active_connections! can call #reap
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 3 |
1 files changed, 2 insertions, 1 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 eb88f191a7..0d61d1d3f3 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -186,8 +186,9 @@ module ActiveRecord end def clear_stale_cached_connections! # :nodoc: + reap end - deprecate :clear_stale_cached_connections! + deprecate :clear_stale_cached_connections! => "Please use #reap instead" # Check-out a database connection from the pool, indicating that you want # to use it. You should call #checkin when you no longer need this. |