aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorChirag Shah <shahchirag1709@gmail.com>2018-05-25 06:55:48 +0530
committerChirag Shah <shahchirag1709@gmail.com>2018-05-25 06:55:48 +0530
commit94a5125508add2d036bffc80a54a9f07d6feb657 (patch)
tree87cab6663dec5e989583d3f0418469e277c47d27 /railties
parentcd4a88123dc17462d5c2ff29172b0366bca14e0e (diff)
downloadrails-94a5125508add2d036bffc80a54a9f07d6feb657.tar.gz
rails-94a5125508add2d036bffc80a54a9f07d6feb657.tar.bz2
rails-94a5125508add2d036bffc80a54a9f07d6feb657.zip
Separate min and max threads count for puma
Same environment variable RAILS_MAX_THREADS was being used for setting the minimum and maximum thread count for puma. This change makes it obvious and easy to decide which environment variable to change for setting the min or max. Don't feel like this is a breaking change as the same default is maintained.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt5
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt
index a5eccf816b..da3f99ec2b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt
@@ -4,8 +4,9 @@
# the maximum value specified for Puma. Default is set to 5 threads for minimum
# and maximum; this matches the default thread size of Active Record.
#
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-threads threads_count, threads_count
+min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { 5 }
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+threads min_threads_count, max_threads_count
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#