specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

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

Browse source
This commit is contained in:
Eugen Rochko 2016-11-02 16:38:54 +01:00
parent 53fb7b1aa8
commit e7723ab662
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/database.yml
View file

@ -1,6 +1,6 @@
default: &default default: &default
adapter: postgresql adapter: postgresql
pool: 17 pool: <%= ENV["DB_POOL"] || ENV['RAILS_MAX_THREADS'] || 5 %>
timeout: 5000 timeout: 5000
encoding: unicode encoding: unicode

8
config/puma.rb
View file

@ -30,7 +30,7 @@ workers ENV.fetch("WEB_CONCURRENCY") { 2 }
# you need to make sure to reconnect any threads in the `on_worker_boot` # you need to make sure to reconnect any threads in the `on_worker_boot`
# block. # block.
# #
# preload_app! preload_app!
# The code in the `on_worker_boot` will be called if you are using # 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 # 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 # or connections that may have been created at application boot, Ruby
# cannot share connections between processes. # cannot share connections between processes.
# #
# on_worker_boot do on_worker_boot do
# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
# end end
# Allow puma to be restarted by `rails restart` command. # Allow puma to be restarted by `rails restart` command.
plugin :tmp_restart plugin :tmp_restart