diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-27 17:45:02 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-27 17:45:02 +0300 |
| commit | 842bcfa77700459fcd426fb11a4058d8aa103469 (patch) | |
| tree | 488670b3e4291fb9e92ec179f6a3f1d326ac1856 /config | |
| parent | 0cf5a9cf43ecc35c0d53611b30431b0d49b321a4 (diff) | |
| parent | 9be17322961775ce9ae4aad8cece6db672f059ce (diff) | |
Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into 'master'
Ensure test files are deleted after fs metrics gathering run
Closes #35457
See merge request !13080
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb index 987324a86c9..a2f8421f5d7 100644 --- a/config/initializers/7_prometheus_metrics.rb +++ b/config/initializers/7_prometheus_metrics.rb @@ -6,7 +6,7 @@ Prometheus::Client.configure do |config| config.initial_mmap_file_size = 4 * 1024 config.multiprocess_files_dir = ENV['prometheus_multiproc_dir'] - if Rails.env.development? && Rails.env.test? + if Rails.env.development? || Rails.env.test? config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir') end end |