From 21fab4f41317fe3c7acc7f9395cb1222e4a41074 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Wed, 20 Jan 2016 11:49:42 +0100 Subject: Use env variables for Unicorn memory limits This makes it easier for users to use their own limits based on their server configuration. --- config.ru | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config.ru') diff --git a/config.ru b/config.ru index a2525c81361..1b258e0bd5e 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'] || 200 * 1 << 20).to_i + max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 250 * 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 -- cgit v1.2.3