Merge remote-tracking branch 'upstream/pull/4682'

[rails.git] / config / puma.rb

diff --git a/config/puma.rb b/config/puma.rb
index 5ed44377449e9c5102f0ac5ab01c646097886a70..283e163b1af2221500cbee5ffe3f88a0539b64a9 100644 (file)
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -4,13 +4,13 @@
 # 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.
 #
 # 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.
 #

-max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS", 5)

 min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
 threads min_threads_count, max_threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
 min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
 threads min_threads_count, max_threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #

-port        ENV.fetch("PORT") { 3000 }
+port        ENV.fetch("PORT", 3000)

 
 # Specifies the `environment` that Puma will run in.
 #
 
 # Specifies the `environment` that Puma will run in.
 #