Merge pull request #5888 from jameswritescode/passenger_fix

Don't use unicorn worker killer if using Phusion Passenger

Merge pull request #5888 from jameswritescode/passenger_fix
Don't use unicorn worker killer if using Phusion Passenger
59c5a42e · Dmitriy Zaporozhets · 0e4a8e23 · 756258ab · 59c5a42e
Commit 59c5a42e authored Dec 20, 2013 by Dmitriy Zaporozhets
Show 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
+unless defined?(PhusionPassenger)
-require 'unicorn/worker_killer'
+  # Unicorn self-process killer
+  require 'unicorn/worker_killer'
-# # Max memory size (RSS) per worker
+  # Max memory size (RSS) per worker
-use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20))
+  use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20))
+end
 require ::File.expand_path('../config/environment',  __FILE__)