diff options
| author | James Newton <james@Zaphyous.com> | 2013-12-20 10:30:34 -0600 |
|---|---|---|
| committer | James Newton <james@Zaphyous.com> | 2013-12-20 10:30:34 -0600 |
| commit | 756258ab1dcbae59425711b78efb57e48316ded0 (patch) | |
| tree | 8052229875ce92d5639f6ae0de54accfa7621ccb | |
| parent | 0e4a8e231c19dd2258067fe8a04a69cda305d0ff (diff) | |
| download | gitlab-ce-756258ab1dcbae59425711b78efb57e48316ded0.tar.gz | |
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__) |