Merge pull request rails#36542 from spk/add-pidfile-option-to-puma-conf

rafaelfranca · web-flow · commit 9c913116c634 · 2019-07-23T10:45:34.000-04:00
Add pidfile option to puma config template
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
@@ -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`.

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ port ENV.fetch("PORT") { 3000 }`
`16`	`16`	`#`
`17`	`17`	`environment ENV.fetch("RAILS_ENV") { "development" }`
`18`	`18`
	`19`	+# Specifies the `pidfile` that Puma will use.
	`20`	`+pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }`
	`21`	`+`
`19`	`22`	# Specifies the number of `workers` to boot in clustered mode.
`20`	`23`	`# Workers are forked web server processes. If using threads and workers together`
`21`	`24`	# the concurrency of the application would be max `threads` * `workers`.