Merge pull request #90 from mitocw/cg/tcp_unicorn_config

Adding additional config for production tcp listener

config/unicorn.rb

@@ -5,17 +5,3 @@ preload_app true
 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
-    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_tcp.rb

+require 'tmpdir'
+worker_processes Integer(ENV['WORKER_PROCESSES'] || 4)
+timeout 25
+preload_app true
+
+listen_host = ENV['LISTEN_HOST'] || '0.0.0.0'
+listen_port = ENV['LISTEN_PORT'] || '4567'
+listen "#{listen_host}:#{listen_port}", :tcp_nopush => true, :backlog => 512
+
+data_dir = ENV['DATA_DIR'] || Dir.tmpdir
+pid "#{data_dir}/forum_unicorn.pid"