From 335172c411042e9a29f05b05508f18c28c4fc881 Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Tue, 24 Jan 2012 15:42:13 -0800 Subject: [PATCH] move unicorn killer to initializer so thin still works, also a fix for newrelic not sending data --- config.ru | 4 +--- config/initializers/unicorn_setup.rb | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 config/initializers/unicorn_setup.rb diff --git a/config.ru b/config.ru index 760f0b248..73f9ca8ba 100644 --- a/config.ru +++ b/config.ru @@ -1,4 +1,4 @@ -# 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 diff --git a/config/initializers/unicorn_setup.rb b/config/initializers/unicorn_setup.rb new file mode 100644 index 000000000..1f430ee5e --- /dev/null +++ b/config/initializers/unicorn_setup.rb @@ -0,0 +1,7 @@ +# 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