617dcfd5e4
This update has two important fixes: 1. It reverts the monkey patch introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23385 since https://github.com/rack/rack/pull/1201 is now part of the release. 2. Preserve forwarded IP address for trusted proxy chains (https://github.com/rack/rack/pull/1343).
28 lines
735 B
Ruby
28 lines
735 B
Ruby
# 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__)
|
|
|
|
warmup do |app|
|
|
client = Rack::MockRequest.new(app)
|
|
client.get('/')
|
|
end
|
|
|
|
map ENV['RAILS_RELATIVE_URL_ROOT'] || "/" do
|
|
use Gitlab::Middleware::ReleaseEnv
|
|
run Gitlab::Application
|
|
end
|