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 /lib | |
| parent | fa8ec52a717a1e019e867ebd884c20f5f17bbe02 (diff) | |
| download | gitlab-ce-2c3d52161af2f170bdb644b96b6ffe5da0c1df10.tar.gz | |
Update Prometheus gem to version that explicitly calls `munmap`
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics/prometheus.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/metrics/prometheus.rb b/lib/gitlab/metrics/prometheus.rb index fb7bbc7cfc7..460dab47276 100644 --- a/lib/gitlab/metrics/prometheus.rb +++ b/lib/gitlab/metrics/prometheus.rb @@ -6,9 +6,11 @@ module Gitlab include Gitlab::CurrentSettings def metrics_folder_present? - ENV.has_key?('prometheus_multiproc_dir') && - ::Dir.exist?(ENV['prometheus_multiproc_dir']) && - ::File.writable?(ENV['prometheus_multiproc_dir']) + multiprocess_files_dir = ::Prometheus::Client.configuration.multiprocess_files_dir + + multiprocess_files_dir && + ::Dir.exist?(multiprocess_files_dir) && + ::File.writable?(multiprocess_files_dir) end def prometheus_metrics_enabled? |