summaryrefslogtreecommitdiff
path: root/config.ru
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-05-19 18:27:36 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-06-02 19:45:58 +0200
commitc10d55a6dafc6dafe0d3b2d9fad1dc66aee07ff6 (patch)
treef6506a266dd361d7f4d24b0239238e6ad556f9cf /config.ru
parent6726922890fa0becd6e0bcd91ca5d2fa79fcccef (diff)
downloadgitlab-ce-c10d55a6dafc6dafe0d3b2d9fad1dc66aee07ff6.tar.gz
Use only ENV for metrics folder location
Diffstat (limited to 'config.ru')
-rw-r--r--config.ru5
1 files changed, 2 insertions, 3 deletions
diff --git a/config.ru b/config.ru
index cba44122da9..9e474a7c08c 100644
--- a/config.ru
+++ b/config.ru
@@ -13,10 +13,9 @@ if defined?(Unicorn)
# Max memory size (RSS) per worker
use Unicorn::WorkerKiller::Oom, min, max
end
-
- # TODO(lyda): Needs to be set externally.
- ENV['prometheus_multiproc_dir'] = '/tmp/somestuff'
end
+# set default for multiproces metrics gathering
+ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_data_dir'
require ::File.expand_path('../config/environment', __FILE__)