diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-05-28 07:28:19 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-05-28 07:28:19 +0000 |
| commit | 492249f9345fbc09a2b79cb8083bcbcdcef102b3 (patch) | |
| tree | 9e31469ea57f896da503a9e5774a7d972eec756f | |
| parent | 13f2ab3e3dabae9fe5013fc6d32d246b534df991 (diff) | |
| parent | 694743170c75263bcecc1cd81314a35741002d23 (diff) | |
| download | gitlab-ce-492249f9345fbc09a2b79cb8083bcbcdcef102b3.tar.gz | |
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
| -rw-r--r-- | config.ru | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/config.ru b/config.ru index e90863a5c21..a2525c81361 100644 --- a/config.ru +++ b/config.ru @@ -2,11 +2,14 @@ if defined?(Unicorn) require 'unicorn' - # Unicorn self-process killer - require 'unicorn/worker_killer' - # Max memory size (RSS) per worker - use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20)) + 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__) |