diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-03-07 22:46:59 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-03-07 22:46:59 +0100 |
| commit | b700153507b7d539a57a6e3bcf03c84776795051 (patch) | |
| tree | 4058d0ea7663962490fd03798a3d019f8deac0ec /railties/guides/code/getting_started/config | |
| parent | 73324fd830723022178fe87e42e081442846145b (diff) | |
| download | rails-b700153507b7d539a57a6e3bcf03c84776795051.tar.gz rails-b700153507b7d539a57a6e3bcf03c84776795051.tar.bz2 rails-b700153507b7d539a57a6e3bcf03c84776795051.zip | |
Revert "let the connection pool of new applications have size 1 rather than 5"
Reason: Temporarily reverting this because it has uncovered an issue that
prevents Sam's test suite from passing.
This reverts commit 9b2c38b7bd582d9712c3779294a9bccde7bbd548.
Diffstat (limited to 'railties/guides/code/getting_started/config')
| -rw-r--r-- | railties/guides/code/getting_started/config/database.yml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/railties/guides/code/getting_started/config/database.yml b/railties/guides/code/getting_started/config/database.yml index 32a998ad72..51a4dd459d 100644 --- a/railties/guides/code/getting_started/config/database.yml +++ b/railties/guides/code/getting_started/config/database.yml @@ -6,9 +6,7 @@ development: adapter: sqlite3 database: db/development.sqlite3 - # Maximum number of database connections available per process. Please - # increase this number in multithreaded applications. - pool: 1 + pool: 5 timeout: 5000 # Warning: The database defined as "test" will be erased and @@ -17,15 +15,11 @@ development: test: adapter: sqlite3 database: db/test.sqlite3 - # Maximum number of database connections available per process. Please - # increase this number in multithreaded applications. - pool: 1 + pool: 5 timeout: 5000 production: adapter: sqlite3 database: db/production.sqlite3 - # Maximum number of database connections available per process. Please - # increase this number in multithreaded applications. - pool: 1 + pool: 5 timeout: 5000 |