Commit 41b1edb5 authored by Kirill Smelkov's avatar Kirill Smelkov

gitlab/config.ru: Convert/integrate to slapos

Just convert 2 parameters used in that file to jinja syntax and add
those parameters (unicorn OOM killer tunables) to gitlab-parameters.cfg

/cc @kazuhiko, @jerome
parent b20c258b
...@@ -12,3 +12,8 @@ ...@@ -12,3 +12,8 @@
# db advanced # db advanced
configuration.db_pool = 10 configuration.db_pool = 10
# unicorn advanced
configuration.unicorn_worker_memory_limit_min = 200*(1024**2)
configuration.unicorn_worker_memory_limit_max = 250*(1024**2)
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
# This file is used by Rack-based servers to start the application. # This file is used by Rack-based servers to start the application.
{% from 'macrolib.cfg.in' import cfg with context %}
if defined?(Unicorn) if defined?(Unicorn)
require 'unicorn' require 'unicorn'
...@@ -14,7 +16,7 @@ if defined?(Unicorn) ...@@ -14,7 +16,7 @@ if defined?(Unicorn)
require 'unicorn/worker_killer' require 'unicorn/worker_killer'
# Max memory size (RSS) per worker # Max memory size (RSS) per worker
use Unicorn::WorkerKiller::Oom, (<%= @worker_memory_limit_min %>), (<%= @worker_memory_limit_max %>) use Unicorn::WorkerKiller::Oom, ({{ cfg('unicorn_worker_memory_limit_min') }}), ({{ cfg('unicorn_worker_memory_limit_max') }})
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment