kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Handle case where GITLAB_PROMETHEUS_METRICS_ENABLED is non boolean value by defaulting to false

This commit is contained in:
Pawel Chojnacki 2017-06-06 13:16:55 +02:00
parent d26573c6e3
commit 4679107fdc
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/fixtures/production/010_settings.rb
View File

@ -20,7 +20,7 @@ end
if ENV['GITLAB_PROMETHEUS_METRICS_ENABLED'].present?
settings = Gitlab::CurrentSettings.current_application_settings
value = Gitlab::Utils.to_boolean(ENV['GITLAB_PROMETHEUS_METRICS_ENABLED'])
value = Gitlab::Utils.to_boolean(ENV['GITLAB_PROMETHEUS_METRICS_ENABLED']) || false
settings.prometheus_metrics_enabled = value
save(settings, 'Prometheus metrics enabled flag')
end

12
spec/db/production/settings_spec.rb
View File

@ -42,5 +42,17 @@ describe 'seed production settings', lib: true do
expect(settings.prometheus_metrics_enabled).to eq(false)
end
end
context 'GITLAB_PROMETHEUS_METRICS_ENABLED is false' do
before do
stub_env('GITLAB_PROMETHEUS_METRICS_ENABLED', '')
end
it 'prometheus_metrics_enabled is set to false' do
load(settings_file)
expect(settings.prometheus_metrics_enabled).to eq(false)
end
end
end
end