Permalink
Browse files

Rename `checked_out` to more descriptive `active_connections`

  • Loading branch information...
1 parent b72b477 commit 5725e397fe7ea34c7479863278d7db6f18e7658e @tenderlove tenderlove committed Nov 29, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -231,11 +231,11 @@ def checkout
@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 @@ def checkout_and_verify(c)
c
end
- def checked_out
+ def active_connections
@connections.find_all { |c| c.in_use? }
end
end

0 comments on commit 5725e39

Please sign in to comment.