diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-05-29 14:19:43 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 19:45:58 +0200 |
| commit | c134a72cdb7e6de8b70dc60de99cf4edc68a9227 (patch) | |
| tree | 0082ba4d422cc53eea223583bca9c98cbc823c96 /config.ru | |
| parent | 770f07cd5c68075bb261f4b6139c92b2ac9309c0 (diff) | |
| download | gitlab-ce-c134a72cdb7e6de8b70dc60de99cf4edc68a9227.tar.gz | |
Move Prometheus presentation logic to PrometheusText
+ Use NullMetrics to mock metrics when unused
+ Use method_missing in NullMetrics mocking
+ Update prometheus gem to version that correctly uses transitive dependencies
+ Ensure correct folders are used in Multiprocess prometheus client tests.
+ rename Sessions controller's metric
Diffstat (limited to 'config.ru')
| -rw-r--r-- | config.ru | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.ru b/config.ru index 2614c9aaf74..89aba462f19 100644 --- a/config.ru +++ b/config.ru @@ -16,7 +16,7 @@ if defined?(Unicorn) end # set default directory for multiproces metrics gathering -ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_data_dir' +ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir' require ::File.expand_path('../config/environment', __FILE__) |