Do not preload_app with unicorn, update newrelic agent so that it doesn't require this setting.

This commit is contained in:
Rohan Mitchell
2015-06-10 17:03:56 +10:00
parent d79129880e
commit a0fd91dc57
2 changed files with 3 additions and 28 deletions

View File

@@ -354,7 +354,7 @@ GEM
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.8)
newrelic_rpm (3.6.7.152)
newrelic_rpm (3.12.0.288)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
oj (2.1.2)

View File

@@ -1,27 +1,2 @@
preload_app true # https://newrelic.com/docs/ruby/no-data-with-unicorn
worker_processes 4 # amount of unicorn workers to spin up
timeout 60 # restarts workers that hang for 30 seconds
# https://devcenter.heroku.com/articles/forked-pg-connections
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
defined?(ActiveRecord::Base) and
ActiveRecord::Base.connection.disconnect!
end
after_fork do |server, worker|
Signal.trap 'TERM' do
puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
end
defined?(ActiveRecord::Base) and
ActiveRecord::Base.establish_connection
end
worker_processes 2 # amount of unicorn workers to spin up
timeout 120 # restarts workers that hang for 30 seconds