diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
| commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
| tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /sidekiq_cluster | |
| parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) | |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'sidekiq_cluster')
| -rw-r--r-- | sidekiq_cluster/cli.rb | 4 |
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 |