logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 0f8b7d06604d81a102eae1b263072fd04fa4cbe0
parent: e3325528168c45a1c4cb1bf765077ecabe35c93d
Author: Ash Furrow <ash@ashfurrow.com>
Date:   Sat, 15 Apr 2017 17:02:13 -0400

Removed Heroku in-process spawning. (#1873)


Diffstat:

Mconfig/puma.rb4----
1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/config/puma.rb b/config/puma.rb @@ -8,10 +8,6 @@ workers ENV.fetch('WEB_CONCURRENCY') { 2 } preload_app! on_worker_boot do - if ENV['HEROKU'] # Spawn the workers from Puma, to only use one dyno - @sidekiq_pid ||= spawn('bundle exec sidekiq -q default -q push -q pull -q mailers ') - end - ActiveRecord::Base.establish_connection if defined?(ActiveRecord) end