logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: e7723ab6625d3cd48b44ddbd340854ea960706f6
parent: 53fb7b1aa84a76d66ef6973208e1c76a100774f3
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Wed,  2 Nov 2016 16:38:54 +0100

Add puma preloading, decrease DB pool size to size of threads per worker

Diffstat:

Mconfig/database.yml2+-
Mconfig/puma.rb8++++----
2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/database.yml b/config/database.yml @@ -1,6 +1,6 @@ default: &default adapter: postgresql - pool: 17 + pool: <%= ENV["DB_POOL"] || ENV['RAILS_MAX_THREADS'] || 5 %> timeout: 5000 encoding: unicode diff --git a/config/puma.rb b/config/puma.rb @@ -30,7 +30,7 @@ workers ENV.fetch("WEB_CONCURRENCY") { 2 } # you need to make sure to reconnect any threads in the `on_worker_boot` # block. # -# preload_app! +preload_app! # 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 @@ -39,9 +39,9 @@ workers ENV.fetch("WEB_CONCURRENCY") { 2 } # or connections that may have been created at application boot, Ruby # cannot share connections between processes. # -# on_worker_boot do -# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) -# end +on_worker_boot do + ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +end # Allow puma to be restarted by `rails restart` command. plugin :tmp_restart