archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity

sync config/gitlabhq/puma.rb to gitlab v18.7.0

Browse Source 
Without those changes puma (and then gitlab itself) does not starts

See following upstream changes:
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128619
  (overwritten by gitlab-org/gitlab!132581)
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132581
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/211331
This commit is contained in:
KIMURA Kazunori 2026-01-06 12:35:04 +09:00 committed by Steven Achilles
parent baa49e0398
commit 1934927aeb
1 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
assets/runtime/config/gitlabhq/puma.rb
View File

@ -40,30 +40,47 @@ workers {{PUMA_WORKERS}}
require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/lifecycle_events"
on_restart do
# Signal application hooks that we're about to restart
Gitlab::Cluster::LifecycleEvents.do_before_master_restart
if Gem::Version.new(Puma::Const::PUMA_VERSION) < Gem::Version.new('7.0')
Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
on_restart do
# Signal application hooks that we're about to restart
Gitlab::Cluster::LifecycleEvents.do_before_master_restart
end
on_worker_boot do
# Signal application hooks of worker start
Gitlab::Cluster::LifecycleEvents.do_worker_start
end
on_worker_shutdown do
# Signal application hooks that a worker is shutting down
Gitlab::Cluster::LifecycleEvents.do_worker_stop
end
else
Gitlab::Cluster::LifecycleEvents.set_puma_worker_count(3)
before_restart do
# Signal application hooks that we're about to restart
Gitlab::Cluster::LifecycleEvents.do_before_master_restart
end
before_worker_boot do
# Signal application hooks of worker start
Gitlab::Cluster::LifecycleEvents.do_worker_start
end
before_worker_shutdown do
# Signal application hooks that a worker is shutting down
Gitlab::Cluster::LifecycleEvents.do_worker_stop
end
end
before_fork do
# Signal to the puma killer
Gitlab::Cluster::PumaWorkerKillerInitializer.start(@config.options, puma_per_worker_max_memory_mb: {{PUMA_PER_WORKER_MAX_MEMORY_MB}}, puma_master_max_memory_mb: {{PUMA_MASTER_MAX_MEMORY_MB}}) unless ENV['DISABLE_PUMA_WORKER_KILLER']
# Signal application hooks that we're about to fork
Gitlab::Cluster::LifecycleEvents.do_before_fork
end
Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
on_worker_boot do
# Signal application hooks of worker start
Gitlab::Cluster::LifecycleEvents.do_worker_start
end
on_worker_shutdown do
# Signal application hooks that a worker is shutting down
Gitlab::Cluster::LifecycleEvents.do_worker_stop
end
# Preload the application before starting the workers; this conflicts with
# phased restart feature. (off by default)
preload_app!
@ -87,11 +104,10 @@ log_formatter do |str|
json_formatter.call(str)
end
lowlevel_error_handler do |ex, env|
if Raven.configuration.capture_allowed?
Raven.capture_exception(ex, tags: { 'handler': 'puma_low_level' }, extra: { puma_env: env })
end
require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/puma/error_handler"
# note the below is just a Rack response
[500, {}, ["An error has occurred and reported in the system's low-level error handler."]]
error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production')
lowlevel_error_handler do |ex, env, status_code|
error_handler.execute(ex, env, status_code)
end