diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-16 03:15:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-16 03:15:50 +0300 |
| commit | e04431d29efaf17dda9dfbfbd0c5001693b25ee4 (patch) | |
| tree | f114abad1f4882ef6c9c702e8de3a84334809031 /bin | |
| parent | 1c898dc5c10bbedf94386d917259153d73608495 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/metrics-server | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/bin/metrics-server b/bin/metrics-server index 16c98f65f52..d8f2ed9faa4 100755 --- a/bin/metrics-server +++ b/bin/metrics-server @@ -3,14 +3,10 @@ require_relative '../metrics_server/metrics_server' -begin - target = ENV['METRICS_SERVER_TARGET'] - raise "Required: METRICS_SERVER_TARGET=[sidekiq]" unless target == 'sidekiq' +target = ENV['METRICS_SERVER_TARGET'] +raise "METRICS_SERVER_TARGET cannot be blank" if target.blank? - 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 +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, wipe_metrics_dir).start -end +Process.wait(MetricsServer.spawn(target, metrics_dir: metrics_dir, wipe_metrics_dir: wipe_metrics_dir)) |