don't use unicorn worker killer if PhusionPassenger is defined

84093385 · James Newton · Dmitriy Zaporozhets · 221af222 · 84093385
Commit 84093385 authored Dec 20, 2013 by James Newton Committed by Dmitriy Zaporozhets Dec 23, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

config.ru config.ru +6 -4

No files found.
--- a/config.ru
+++ b/config.ru
 # 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__)