diff options
| author | Sebastian Reitenbach <sebastia@l00-bugdead-prods.de> | 2017-03-28 23:29:49 +0200 |
|---|---|---|
| committer | Sebastian Reitenbach <sebastia@l00-bugdead-prods.de> | 2017-03-31 09:45:46 +0200 |
| commit | fd097fa9e12a403d5f56d24b68df9a3ea5ace25c (patch) | |
| tree | a6154e0cca5dd15c667f3191f20e24a8cc504c99 /app/controllers | |
| parent | bcb0a554dd4f8754ab1d6a876edc1481e04aa711 (diff) | |
| download | gitlab-ce-fd097fa9e12a403d5f56d24b68df9a3ea5ace25c.tar.gz | |
Handle parsing OpenBSD ps output properly to display sidekiq
infos on admin->monitoring->background
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/background_jobs_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/background_jobs_controller.rb b/app/controllers/admin/background_jobs_controller.rb index 87eb7ff4c93..5f90ad7137d 100644 --- a/app/controllers/admin/background_jobs_controller.rb +++ b/app/controllers/admin/background_jobs_controller.rb @@ -1,7 +1,7 @@ class Admin::BackgroundJobsController < Admin::ApplicationController def show ps_output, _ = Gitlab::Popen.popen(%W(ps ww -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command)) - @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/) + @sidekiq_processes = ps_output.split("\n").grep(/sidekiq \d+\.\d+\.\d+/) @concurrency = Sidekiq.options[:concurrency] end end |