Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxwell Salzberg <maxwell@joindiaspora.com>2012-01-25 03:42:13 +0400
committerMaxwell Salzberg <maxwell@joindiaspora.com>2012-01-25 03:42:25 +0400
commit335172c411042e9a29f05b05508f18c28c4fc881 (patch)
tree42bd0b09389484faae8dee6d0b629abaedf7ca9f /config.ru
parent8aafd56482c734d849910c7bb51c87e77aac5efa (diff)
move unicorn killer to initializer so thin still works, also a fix for newrelic not sending data
Diffstat (limited to 'config.ru')
-rw-r--r--config.ru4
1 files changed, 1 insertions, 3 deletions
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