summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-27 22:56:35 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-27 22:57:49 -0400
commit694743170c75263bcecc1cd81314a35741002d23 (patch)
tree9e31469ea57f896da503a9e5774a7d972eec756f
parent13f2ab3e3dabae9fe5013fc6d32d246b534df991 (diff)
downloadgitlab-ce-694743170c75263bcecc1cd81314a35741002d23.tar.gz
Disable Unicorn::WorkerKiller in non-production environmentsrs-no-killers-in-development
-rw-r--r--config.ru11
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__)