diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2016-02-10 14:19:21 -0600 |
|---|---|---|
| committer | Richard Schneeman <richard.schneeman@gmail.com> | 2016-02-10 14:19:21 -0600 |
| commit | 391061a30d7ab2923ea342048fe643469de3f1a9 (patch) | |
| tree | 9e4b25f7d0ef84aa1c3ec8d07c453ade98e4fd26 | |
| parent | daa4779d22d3458c5ef45a21370ed0eafb1cd664 (diff) | |
| parent | 1273fc9b1d40238d94ffd16840853d0e986afbc4 (diff) | |
| download | rails-391061a30d7ab2923ea342048fe643469de3f1a9.tar.gz rails-391061a30d7ab2923ea342048fe643469de3f1a9.tar.bz2 rails-391061a30d7ab2923ea342048fe643469de3f1a9.zip | |
Merge pull request #23528 from bensheldon/patch-1
Set database poolsize via rails_max_threads
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml index d51b2ec199..bd5c0b10f6 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml @@ -19,7 +19,7 @@ default: &default encoding: unicode # For details on connection pooling, see rails configuration guide # http://guides.rubyonrails.org/configuring.html#database-pooling - pool: 5 + pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> development: <<: *default |