Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-15 12:17:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-15 12:17:01 +0300
commite7e44c0e4ce493bb103b0fd98f8dd3c90928d291 (patch)
tree3145dea916e51dac9adcfd3d4639eaf27efe0f1e /sidekiq_cluster
parent66fc7ba6f3a4a8e74529192f1dd110d87a91fdfb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'sidekiq_cluster')
-rw-r--r--sidekiq_cluster/cli.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/sidekiq_cluster/cli.rb b/sidekiq_cluster/cli.rb
index bbe95788a35..2feb77601b8 100644
--- a/sidekiq_cluster/cli.rb
+++ b/sidekiq_cluster/cli.rb
@@ -191,11 +191,11 @@ module Gitlab
return unless metrics_server_enabled?
@logger.info("Starting metrics server on port #{sidekiq_exporter_port}")
- @metrics_server_pid = MetricsServer.spawn(
+ @metrics_server_pid = MetricsServer.fork(
'sidekiq',
metrics_dir: @metrics_dir,
wipe_metrics_dir: wipe_metrics_dir,
- trapped_signals: TERMINATE_SIGNALS + FORWARD_SIGNALS
+ reset_signals: TERMINATE_SIGNALS + FORWARD_SIGNALS
)
end