Commit 335172c4 authored by Maxwell Salzberg's avatar Maxwell Salzberg

move unicorn killer to initializer so thin still works, also a fix for newrelic not sending data

parent 8aafd564
# Copyright (c) 2010-2011, Diaspora Inc. This file is
# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
......@@ -8,8 +8,6 @@ require ::File.expand_path('../config/environment', __FILE__)
require ::File.expand_path('../lib/unicorn_killer', __FILE__)
require ::File.expand_path('../lib/rack/chrome_frame', __FILE__)
# use UnicornKiller::MaxRequests, 1000
use UnicornKiller::Oom, 400 * 1024 #kill a unicorn that has gone over 400mB
use Rack::ChromeFrame, :minimum => 8
run Diaspora::Application
# Copyright (c) 2010-2011, Diaspora Inc. This file is
# licensed under the Affero General Public License version 3 or later. See
# the COPYRIGHT file.
if defined? Unicorn
Rails.application.middleware.insert(0, UnicornKiller::Oom, 400 * 1024) #kill a unicorn that has gone over 400mB
NewRelic::Agent.after_fork(:force_reconnect => true) if defined?(NewRelic)
end
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment