diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-20 16:42:02 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-20 18:41:22 +0300 |
| commit | 416b61e010090c61e9e3690afa1925b2509f9ad3 (patch) | |
| tree | ddcca42ba297fa10361798d81048c8cf12909440 /config | |
| parent | 9c763521859771653472b60795077c7f6512f971 (diff) | |
Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' into 'master'
Do not enable prometheus metrics when metrics folder is missing
See merge request !12263
Diffstat (limited to 'config')
| -rw-r--r-- | config/boot.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/boot.rb b/config/boot.rb index 17a71148370..16de55d7a86 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -5,6 +5,11 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +# set default directory for multiproces metrics gathering +if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test' + ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir' +end + # Default Bootsnap configuration from https://github.com/Shopify/bootsnap#usage require 'bootsnap' Bootsnap.setup( |