diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 09:16:11 +0000 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /sidekiq_cluster | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
download | gitlab-ce-edaa33dee2ff2f7ea3fac488d41558eb5f86d68c.tar.gz |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'sidekiq_cluster')
-rw-r--r-- | sidekiq_cluster/cli.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sidekiq_cluster/cli.rb b/sidekiq_cluster/cli.rb index 57649ec74c8..bbe95788a35 100644 --- a/sidekiq_cluster/cli.rb +++ b/sidekiq_cluster/cli.rb @@ -200,9 +200,7 @@ module Gitlab end def sidekiq_exporter_enabled? - ::Settings.monitoring.sidekiq_exporter.enabled - rescue Settingslogic::MissingSetting - nil + ::Settings.dig('monitoring', 'sidekiq_exporter', 'enabled') end def exporter_has_a_unique_port? @@ -216,15 +214,11 @@ module Gitlab end def sidekiq_exporter_port - ::Settings.monitoring.sidekiq_exporter.port - rescue Settingslogic::MissingSetting - nil + ::Settings.dig('monitoring', 'sidekiq_exporter', 'port') end def sidekiq_health_check_port - ::Settings.monitoring.sidekiq_health_checks.port - rescue Settingslogic::MissingSetting - nil + ::Settings.dig('monitoring', 'sidekiq_health_checks', 'port') end def metrics_server_enabled? |