From 756258ab1dcbae59425711b78efb57e48316ded0 Mon Sep 17 00:00:00 2001
From: James Newton <james@Zaphyous.com>
Date: Fri, 20 Dec 2013 10:30:34 -0600
Subject: don't use unicorn worker killer if PhusionPassenger is defined

---
 config.ru | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'config.ru')

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__)
 
-- 
cgit v1.2.1