diff options
| author | Paweł Chojnacki <pawel@chojnacki.ws> | 2017-07-19 08:54:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-19 08:54:39 +0000 |
| commit | 2c3d52161af2f170bdb644b96b6ffe5da0c1df10 (patch) | |
| tree | a4e5d5766c8c74cd782ea18e46afeddf8ae027e1 /config | |
| parent | fa8ec52a717a1e019e867ebd884c20f5f17bbe02 (diff) | |
| download | gitlab-ce-2c3d52161af2f170bdb644b96b6ffe5da0c1df10.tar.gz | |
Update Prometheus gem to version that explicitly calls `munmap`
Diffstat (limited to 'config')
| -rw-r--r-- | config/boot.rb | 5 | ||||
| -rw-r--r-- | config/initializers/7_prometheus_metrics.rb | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/config/boot.rb b/config/boot.rb index 2d01092acd5..f2830ae3166 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -4,8 +4,3 @@ require 'rubygems' 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 diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb new file mode 100644 index 00000000000..987324a86c9 --- /dev/null +++ b/config/initializers/7_prometheus_metrics.rb @@ -0,0 +1,12 @@ +require 'prometheus/client' + +Prometheus::Client.configure do |config| + config.logger = Rails.logger + + config.initial_mmap_file_size = 4 * 1024 + config.multiprocess_files_dir = ENV['prometheus_multiproc_dir'] + + if Rails.env.development? && Rails.env.test? + config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir') + end +end |