diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-11-27 23:39:30 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2017-11-27 23:39:30 +1030 |
| commit | 84cad15213ea5447ea0890a4f017b44ad85b901a (patch) | |
| tree | e5989087aaa6ca6b5e45ef8be17be58757bebdb8 | |
| parent | 9c10fec4c06da38f8975dfb851f4d899aa85f8b7 (diff) | |
| download | rails-84cad15213ea5447ea0890a4f017b44ad85b901a.tar.gz rails-84cad15213ea5447ea0890a4f017b44ad85b901a.tar.bz2 rails-84cad15213ea5447ea0890a4f017b44ad85b901a.zip | |
Drop the before_fork/on_worker_boot advice
It's no longer required for Active Record, and other common libraries
(dalli, redis-rb) all seem to be fork-proof too.
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt | 24 |
1 files changed, 1 insertions, 23 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 1e19380dcb..a5eccf816b 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 @@ -26,31 +26,9 @@ environment ENV.fetch("RAILS_ENV") { "development" } # Use the `preload_app!` method when specifying a `workers` number. # This directive tells Puma to first boot the application and load code # before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. If you use this option -# you need to make sure to reconnect any threads in the `on_worker_boot` -# block. +# process behavior so workers use less memory. # # preload_app! -# If you are preloading your application and using Active Record, it's -# recommended that you close any connections to the database before workers -# are forked to prevent connection leakage. -# -# before_fork do -# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) -# end - -# The code in the `on_worker_boot` will be called if you are using -# clustered mode by specifying a number of `workers`. After each worker -# process is booted, this block will be run. If you are using the `preload_app!` -# option, you will want to use this block to reconnect to any threads -# or connections that may have been created at application boot, as Ruby -# cannot share connections between processes. -# -# on_worker_boot do -# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) -# end -# - # Allow puma to be restarted by `rails restart` command. plugin :tmp_restart |