diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-08 15:13:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-08 15:13:43 +0000 |
| commit | 26b7ec2c6a7ffb01850dbecb0930b4f9412fe0f2 (patch) | |
| tree | c9c8fdd391f97df8eea503a4ff21bb0b31ecb127 /bin | |
| parent | 886ecba0bd2d964504b43303a39cfa2386f0feed (diff) | |
| download | gitlab-ce-26b7ec2c6a7ffb01850dbecb0930b4f9412fe0f2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/metrics-server | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/metrics-server b/bin/metrics-server index 48d3a6402c3..16c98f65f52 100755 --- a/bin/metrics-server +++ b/bin/metrics-server @@ -8,8 +8,9 @@ begin raise "Required: METRICS_SERVER_TARGET=[sidekiq]" unless target == 'sidekiq' metrics_dir = ENV["prometheus_multiproc_dir"] || File.absolute_path("tmp/prometheus_multiproc_dir/#{target}") + wipe_metrics_dir = Gitlab::Utils.to_boolean(ENV['WIPE_METRICS_DIR']) || false # Re-raise exceptions in threads on the main thread. Thread.abort_on_exception = true - MetricsServer.new(target, metrics_dir).start + MetricsServer.new(target, metrics_dir, wipe_metrics_dir).start end |