diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-26 12:11:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-26 12:11:02 +0300 |
| commit | 47d07def1648ffc0787fe92ea5e351ccc5e9c4a4 (patch) | |
| tree | a2d320f623a4f355049326b9e02ed74a3d3e9240 /config.ru | |
| parent | 8bc752f208ea3c2c3218eb407033bd47471c2df5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config.ru')
| -rw-r--r-- | config.ru | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/config.ru b/config.ru index 0c50b3fdf6f..ed76239ef2e 100644 --- a/config.ru +++ b/config.ru @@ -2,25 +2,10 @@ # This file is used by Rack-based servers to start the application. -if defined?(Unicorn) - require 'unicorn' - - if ENV['RAILS_ENV'] == 'production' || ENV['RAILS_ENV'] == 'staging' - # Unicorn self-process killer - require 'unicorn/worker_killer' - - 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 - end -end - require ::File.expand_path('../config/environment', __FILE__) def master_process? - Prometheus::PidProvider.worker_id.in? %w(unicorn_master puma_master) + Prometheus::PidProvider.worker_id == 'puma_master' end warmup do |app| |