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:
authorrpereira2 <rpereira@gitlab.com>2019-08-26 10:11:25 +0300
committerrpereira2 <rpereira@gitlab.com>2019-08-26 10:30:10 +0300
commitb99cf2024d1b518d876bc4f1f4aac8549b4dd993 (patch)
tree25c2ccd04f3d75c4afca104b06bd88c3d2d952e3 /lib/gitlab/database_importers
parent8112fb37544557b3f94c0a558175d5da99ef9829 (diff)
Add nil check for Gitlab.config.prometheus
Diffstat (limited to 'lib/gitlab/database_importers')
-rw-r--r--lib/gitlab/database_importers/self_monitoring/project/create_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/database_importers/self_monitoring/project/create_service.rb b/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
index 164854e1e1a..6badacc2fc9 100644
--- a/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
+++ b/lib/gitlab/database_importers/self_monitoring/project/create_service.rb
@@ -175,7 +175,7 @@ module Gitlab
end
def prometheus_enabled?
- Gitlab.config.prometheus.enable
+ Gitlab.config.prometheus.enable if Gitlab.config.prometheus
rescue Settingslogic::MissingSetting
log_error(_('prometheus.enable is not present in gitlab.yml'))
@@ -183,7 +183,7 @@ module Gitlab
end
def prometheus_listen_address
- Gitlab.config.prometheus.listen_address
+ Gitlab.config.prometheus.listen_address if Gitlab.config.prometheus
rescue Settingslogic::MissingSetting
log_error(_('prometheus.listen_address is not present in gitlab.yml'))