From: Ash Furrow <ash@ashfurrow.com>
Date: Sat, 15 Apr 2017 21:02:13 +0000 (-0400)
Subject: Removed Heroku in-process spawning. (#1873)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0f8b7d06604d81a102eae1b263072fd04fa4cbe0;p=mastodon.git

Removed Heroku in-process spawning. (#1873)
---

diff --git a/config/puma.rb b/config/puma.rb
index 191f00cca..7586536f4 100644
--- 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