fix unicorn defaults; keep using old version of config in Procfile

Procfile

-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.heroku.rb
 

config/unicorn.heroku.rb

+worker_processes 4
+timeout 25
+preload_app true
+
+before_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn master intercepting TERM and sending myself QUIT instead'
+    Process.kill 'QUIT', Process.pid
+  end
+end
+
+after_fork do |server, worker|
+  Signal.trap 'TERM' do
+    puts 'Unicorn worker intercepting TERM and doing nothing. Waiting for master to send QUIT'
+  end
+  ::Mongoid.default_session.disconnect
+end

config/unicorn.rb

-worker_processes ENV['WORKER_PROCESSES'].to_i || 4
+require 'tmpdir'
+worker_processes Integer(ENV['WORKER_PROCESSES'] || 4)
 timeout 25
 preload_app true
-listen "unix:" + ENV['DATA_DIR'] + "/forum.sock", :backlog => 512
-pid ENV['DATA_DIR'] + "/forum_unicorn.pid"
+data_dir = ENV['DATA_DIR'] || Dir.tmpdir
+listen "unix:#{data_dir}/forum.sock", :backlog => 512
+pid "#{data_dir}/forum_unicorn.pid"
 
 before_fork do |server, worker|
   Signal.trap 'TERM' do