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

kkimurak · kkimurak · commit ce92d2c47759 · 2026-01-06T10:57:48.000+09:00
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
diff --git a/assets/runtime/config/gitlabhq/puma.rb b/assets/runtime/config/gitlabhq/puma.rb
@@ -34,34 +34,50 @@
 # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only
 # accepted protocols.
 bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket'
-bind 'tcp://127.0.0.1:8080'
 
 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
-end
+if Gem::Version.new(Puma::Const::PUMA_VERSION) < Gem::Version.new('7.0')
+  Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
 
-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']
+  on_restart do
+    # Signal application hooks that we're about to restart
+    Gitlab::Cluster::LifecycleEvents.do_before_master_restart
+  end
 
-  # Signal application hooks that we're about to fork
-  Gitlab::Cluster::LifecycleEvents.do_before_fork
-end
+  on_worker_boot do
+    # Signal application hooks of worker start
+    Gitlab::Cluster::LifecycleEvents.do_worker_start
+  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
+  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
 
-on_worker_shutdown do
-  # Signal application hooks that a worker is shutting down
-  Gitlab::Cluster::LifecycleEvents.do_worker_stop
+before_fork do
+  # Signal application hooks that we're about to fork
+  Gitlab::Cluster::LifecycleEvents.do_before_fork
 end
 
 # Preload the application before starting the workers; this conflicts with
@@ -87,11 +103,10 @@
   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"
+
+error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production')
 
-  # note the below is just a Rack response
-  [500, {}, ["An error has occurred and reported in the system's low-level error handler."]]
+lowlevel_error_handler do |ex, env, status_code|
+  error_handler.execute(ex, env, status_code)
 end
