aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-09-08 17:28:59 +0200
committerYves Senn <yves.senn@gmail.com>2015-09-08 17:28:59 +0200
commit8d1af2b10c02ab5ecd32be0d2a5b1f937ddd25e1 (patch)
tree8b304ce8e1553c6f5a9bbb4034a9ef896f922ec3 /guides/source
parent269050072d53bc34d779c4f807c444aacb08a61a (diff)
parent7dc490b709dbe7fe6b0be1622202f1d51ec88403 (diff)
downloadrails-8d1af2b10c02ab5ecd32be0d2a5b1f937ddd25e1.tar.gz
rails-8d1af2b10c02ab5ecd32be0d2a5b1f937ddd25e1.tar.bz2
rails-8d1af2b10c02ab5ecd32be0d2a5b1f937ddd25e1.zip
Merge pull request #21512 from X0nic/guides-clarify-timeout-error
[Rails Guides] clarify `ActiveRecord::ConnectionTimeoutError`
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/configuring.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 8672525e2b..5e72b96787 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -1096,7 +1096,7 @@ you and wait for a connection from the pool. If it cannot get a connection, a
timeout error similar to that given below will be thrown.
```ruby
-ActiveRecord::ConnectionTimeoutError - could not obtain a database connection within 5 seconds. The max pool size is currently 5; consider increasing it:
+ActiveRecord::ConnectionTimeoutError - could not obtain a database connection within 5.000 seconds (waited 5.000 seconds)
```
If you get the above error, you might want to increase the size of the