]> cat aescling's git repositories - mastodon.git/commitdiff
Removed Heroku in-process spawning. (#1873)
authorAsh Furrow <ash@ashfurrow.com>
Sat, 15 Apr 2017 21:02:13 +0000 (17:02 -0400)
committerEugen <eugen@zeonfederated.com>
Sat, 15 Apr 2017 21:02:13 +0000 (23:02 +0200)
config/puma.rb

index 191f00ccaae9971bc5ba43670ad6d479999e845d..7586536f44910dd88e8da63297d60d173b186449 100644 (file)
@@ -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