home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Disable Unicorn::WorkerKiller in non-production environments

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

See merge request !729
This commit is contained in:
Marin Jankovski
2015-05-28 07:28:19 +00:00
parent 13f2ab3e3d 694743170c
commit 492249f934
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.ru
+7 -4
View File
@@ -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__)