diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-21 22:59:15 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-21 22:59:15 +0100 |
| commit | 308abc8db05f75da8f1cc66facb5e85bee5c69c4 (patch) | |
| tree | 6b0acf3cbcf7036fb831381cfe195ad572d6a3c8 /config.ru | |
| parent | a42fe49c8c953c0aa8ca20c8fb5a141447128894 (diff) | |
| parent | c176fb40a52d32edc54843a5b54884cbab1e67e1 (diff) | |
| download | gitlab-ce-308abc8db05f75da8f1cc66facb5e85bee5c69c4.tar.gz | |
Merge branch 'master' into housekeeping-doc
Diffstat (limited to 'config.ru')
| -rw-r--r-- | config.ru | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config.ru b/config.ru index a2525c81361..065ce59932f 100644 --- a/config.ru +++ b/config.ru @@ -7,8 +7,11 @@ if defined?(Unicorn) # Unicorn self-process killer require 'unicorn/worker_killer' + min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 300 * 1 << 20).to_i + max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 350 * 1 << 20).to_i + # Max memory size (RSS) per worker - use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20)) + use Unicorn::WorkerKiller::Oom, min, max end end |