diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-09-04 17:20:24 +0200 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-09-04 17:20:24 +0200 |
commit | 1156bbc06ce83e97b9202a06f9f9028d771bb1d4 (patch) | |
tree | e4380b564577f00616b47a2e8acfcdfe291cab32 | |
parent | cd498e25887cafc5d2b0d427b3f87af9f648aff5 (diff) | |
parent | ca5ffd10b9749ef0d55d7b5b08e2e7820fc2f8a5 (diff) | |
download | rails-1156bbc06ce83e97b9202a06f9f9028d771bb1d4.tar.gz rails-1156bbc06ce83e97b9202a06f9f9028d771bb1d4.tar.bz2 rails-1156bbc06ce83e97b9202a06f9f9028d771bb1d4.zip |
Merge branch 'master' of git@github.com:rails/rails
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 2 |
1 files changed, 1 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 5806dea061..54a39db1eb 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -145,7 +145,7 @@ module ActiveRecord if @queue.wait(@timeout) checkout_existing_connection else - raise ConnectionTimeoutError, "could not obtain a database connection in a timely fashion" + raise ConnectionTimeoutError, "could not obtain a database connection within #{@timeout} seconds. The pool size is currently #{@size}, perhaps you need to increase it?" end end end |