diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-29 13:48:31 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-11-29 14:02:59 -0800 |
commit | 5725e397fe7ea34c7479863278d7db6f18e7658e (patch) | |
tree | 825c10c675039cda0f6e07619034eb43c38ea24e /activerecord/lib/active_record | |
parent | b72b477c373b54200bfc49c8c0b0f9e42e7e68e3 (diff) | |
download | rails-5725e397fe7ea34c7479863278d7db6f18e7658e.tar.gz rails-5725e397fe7ea34c7479863278d7db6f18e7658e.tar.bz2 rails-5725e397fe7ea34c7479863278d7db6f18e7658e.zip |
Rename `checked_out` to more descriptive `active_connections`
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 6 |
1 files changed, 3 insertions, 3 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 260d58b2e0..0b3971a0a6 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -231,11 +231,11 @@ module ActiveRecord @queue.wait(@timeout) - if(checked_out.size < @connections.size) + if(active_connections.size < @connections.size) next else clear_stale_cached_connections! - if @size == checked_out.size + if @size == active_connections.size raise ConnectionTimeoutError, "could not obtain a database connection#{" within #{@timeout} seconds" if @timeout}. The max pool size is currently #{@size}; consider increasing it." end end @@ -286,7 +286,7 @@ module ActiveRecord c end - def checked_out + def active_connections @connections.find_all { |c| c.in_use? } end end |