Permalink
Browse files

Merge branch 'master' of git@github.com:rails/rails

  • Loading branch information...
2 parents cd498e2 + ca5ffd1 commit 1156bbc06ce83e97b9202a06f9f9028d771bb1d4 @jeremy jeremy committed Sep 4, 2008
@@ -145,7 +145,7 @@ def checkout
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

0 comments on commit 1156bbc

Please sign in to comment.