Commit 59c5a42e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #5888 from jameswritescode/passenger_fix

Don't use unicorn worker killer if using Phusion Passenger
parents 0e4a8e23 756258ab
# This file is used by Rack-based servers to start the application. # 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__) require ::File.expand_path('../config/environment', __FILE__)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment