diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-16 10:40:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-16 10:40:55 +0000 |
| commit | a4449d880e5454188d9fdb31631bda0d160b2a9b (patch) | |
| tree | 5794118f0f5637b44dc77517ceecc0a30b51eabc | |
| parent | 2e08fd3c9c92e7f572665fbacc8602bee80c5ad1 (diff) | |
| parent | f982fef9b523a87ff7e48158bd20713789a8ee89 (diff) | |
| download | gitlab-ce-a4449d880e5454188d9fdb31631bda0d160b2a9b.tar.gz | |
Merge branch 'set_proper_defaults_for_metric_paths' into 'master'
set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru
See merge request !12201
| -rw-r--r-- | config.ru | 3 | ||||
| -rw-r--r-- | config/boot.rb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config.ru b/config.ru index 89aba462f19..065ce59932f 100644 --- a/config.ru +++ b/config.ru @@ -15,9 +15,6 @@ if defined?(Unicorn) end end -# set default directory for multiproces metrics gathering -ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir' - require ::File.expand_path('../config/environment', __FILE__) map ENV['RAILS_RELATIVE_URL_ROOT'] || "/" do diff --git a/config/boot.rb b/config/boot.rb index 17a71148370..db5ab918021 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -5,6 +5,9 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +# set default directory for multiproces metrics gathering +ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir' + # Default Bootsnap configuration from https://github.com/Shopify/bootsnap#usage require 'bootsnap' Bootsnap.setup( |