diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-06 13:16:55 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-06 13:16:55 +0200 |
| commit | 4679107fdce6d88733c82329495b667d1a032217 (patch) | |
| tree | c80f9714fb37357f182a02f58cde963bf4b61c9d | |
| parent | d26573c6e3de535f69437deaf54d5c151ac343c8 (diff) | |
| download | gitlab-ce-4679107fdce6d88733c82329495b667d1a032217.tar.gz | |
Handle case where GITLAB_PROMETHEUS_METRICS_ENABLED is non boolean value by defaulting to false
| -rw-r--r-- | db/fixtures/production/010_settings.rb | 2 | ||||
| -rw-r--r-- | spec/db/production/settings_spec.rb | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/db/fixtures/production/010_settings.rb b/db/fixtures/production/010_settings.rb index a81782d16ff..7626cdb0b9c 100644 --- a/db/fixtures/production/010_settings.rb +++ b/db/fixtures/production/010_settings.rb @@ -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 diff --git a/spec/db/production/settings_spec.rb b/spec/db/production/settings_spec.rb index 00c631b866e..a9d015e0666 100644 --- a/spec/db/production/settings_spec.rb +++ b/spec/db/production/settings_spec.rb @@ -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 |