diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-15 23:41:47 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-15 23:41:47 +0200 |
| commit | f982fef9b523a87ff7e48158bd20713789a8ee89 (patch) | |
| tree | 26153f9e03a817fcde177c7437f69d59ff69b118 | |
| parent | 75d425e4fcfb884960e179d5268a14829e183a70 (diff) | |
| download | gitlab-ce-f982fef9b523a87ff7e48158bd20713789a8ee89.tar.gz | |
set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru
| -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( |