aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael França <rafael@franca.dev>2019-07-23 10:45:34 -0400
committerGitHub <noreply@github.com>2019-07-23 10:45:34 -0400
commit9c913116c634fe5fe2159a94b8f1a244801a4877 (patch)
tree73cd61bf2e415346f26901379f332ca3806ffec0 /railties
parentfc175375e13d50213e796700c48ec0ab0b60b2fc (diff)
parent36f3dd333bcf1d94dbf0d086b501df5804663bce (diff)
downloadrails-9c913116c634fe5fe2159a94b8f1a244801a4877.tar.gz
rails-9c913116c634fe5fe2159a94b8f1a244801a4877.tar.bz2
rails-9c913116c634fe5fe2159a94b8f1a244801a4877.zip
Merge pull request #36542 from spk/add-pidfile-option-to-puma-conf
Add pidfile option to puma config template
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt3
1 files changed, 3 insertions, 0 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 649253aeca..5ed4437744 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
@@ -16,6 +16,9 @@ port ENV.fetch("PORT") { 3000 }
#
environment ENV.fetch("RAILS_ENV") { "development" }
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+
# Specifies the number of `workers` to boot in clustered mode.
# Workers are forked web server processes. If using threads and workers together
# the concurrency of the application would be max `threads` * `workers`.