Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2018-03-23 02:49:13 +0300
committerDJ Mountney <david@twkie.net>2018-03-23 03:21:10 +0300
commitf4218f277adf59a76da43ca534037feff024614d (patch)
tree486c74201102a32b5e7840514d82fbc9641250f7 /config.ru
parentbe0ce05c5d07b0b27be243f0a3d57b662dcab1af (diff)
Increase the memory limits used in the unicorn killer
These limits were updated in our docs, and in omnibus some time ago. But the defaults in the source-install were missed.
Diffstat (limited to 'config.ru')
-rw-r--r--config.ru4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.ru b/config.ru
index 7b15939c6ff..405d01863ac 100644
--- a/config.ru
+++ b/config.ru
@@ -7,8 +7,8 @@ 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
+ min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 400 * 1 << 20).to_i
+ max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 650 * 1 << 20).to_i
# Max memory size (RSS) per worker
use Unicorn::WorkerKiller::Oom, min, max