diff options
| author | James Newton <james@Zaphyous.com> | 2013-12-20 20:30:34 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-23 22:43:31 +0400 |
| commit | 84093385d6f70946dae0772a0913e19ab6a16db0 (patch) | |
| tree | 66d5cf14e80739909e76fefc86cb2a0da99ba787 | |
| parent | 221af222d685dfcd34c99b1f5d757a04ce1409e2 (diff) | |
don't use unicorn worker killer if PhusionPassenger is defined
| -rw-r--r-- | config.ru | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config.ru b/config.ru index 1edcd391e45..f7e5e091534 100644 --- a/config.ru +++ b/config.ru @@ -1,10 +1,12 @@ # This file is used by Rack-based servers to start the application. -# Unicorn self-process killer -require 'unicorn/worker_killer' +unless defined?(PhusionPassenger) + # Unicorn self-process killer + require 'unicorn/worker_killer' -# # Max memory size (RSS) per worker -use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20)) + # Max memory size (RSS) per worker + use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20)) +end require ::File.expand_path('../config/environment', __FILE__) |