aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrhenium <re4k@re4k.info>2013-06-01 00:27:42 +0900
committerrhenium <re4k@re4k.info>2013-06-01 00:27:42 +0900
commit8a3690022042f013651172736ce9895dedd82556 (patch)
tree88e221e4fc383a65ece99ba87ea9bc00ccbc05ac
parente1b34a2234a7ff30c30f643d59b73c610372a8c0 (diff)
downloadaclog-8a3690022042f013651172736ce9895dedd82556.tar.gz
add unicorn-worker-killer gem
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
-rw-r--r--config.ru11
3 files changed, 12 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index de42bc0..c1238ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,6 +10,7 @@ gem 'settingslogic'
gem 'yajl-ruby', require: "yajl"
gem 'unicorn'
+gem 'unicorn-worker-killer'
gem 'thin'
gem 'daemon-spawn', require: 'daemon_spawn'
gem 'msgpack'
diff --git a/Gemfile.lock b/Gemfile.lock
index cc284da..32decdf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,6 +177,8 @@ GEM
kgio (~> 2.6)
rack
raindrops (~> 0.7)
+ unicorn-worker-killer (0.4.1)
+ unicorn (~> 4)
webmock (1.11.0)
addressable (>= 2.2.7)
crack (>= 0.3.2)
@@ -209,5 +211,6 @@ DEPENDENCIES
twitter
uglifier (>= 1.0.3)
unicorn
+ unicorn-worker-killer
webmock
yajl-ruby
diff --git a/config.ru b/config.ru
index 5bd6cd0..5ff2a90 100644
--- a/config.ru
+++ b/config.ru
@@ -1,8 +1,13 @@
require ::File.expand_path('../config/environment', __FILE__)
-require "unicorn_killer"
-use UnicornKiller::Oom, 144 * 1024
-use UnicornKiller::MaxRequests, 1000
+# Unicorn self-process killer
+require 'unicorn/worker_killer'
+
+# Max requests per worker
+use Unicorn::WorkerKiller::MaxRequests, 3072, 4096
+
+# Max memory size (RSS) per worker
+use Unicorn::WorkerKiller::Oom, (144*(1024**2)), (256*(1024**2))
run Aclog::Application