Commit 492249f9 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'rs-no-killers-in-development' into 'master'

Disable Unicorn::WorkerKiller in non-production environments

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2281

See merge request !729
parents 13f2ab3e 69474317
......@@ -2,11 +2,14 @@
if defined?(Unicorn)
require 'unicorn'
if ENV['RAILS_ENV'] == 'production' || ENV['RAILS_ENV'] == 'staging'
# Unicorn self-process killer
require 'unicorn/worker_killer'
# Max memory size (RSS) per worker
use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20))
end
end
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