diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-29 17:16:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-29 17:16:13 +0000 |
| commit | b351a77a52954832470a1adc05228e444ed0f651 (patch) | |
| tree | 7cbc55ec89d07c2caac1df168a5f169612c22677 /app/controllers | |
| parent | c189bf11f43f5ae3944dec38de3dd875397aef50 (diff) | |
| parent | d8569440b5008f9cd383515d5dce3bf8730bbef6 (diff) | |
| download | gitlab-ce-b351a77a52954832470a1adc05228e444ed0f651.tar.gz | |
Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master'
Make bundle exec rake gitlab:check RAILS_ENV=production
Closes #30084
See merge request !10246
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 c09095b9849..87eb7ff4c93 100644 --- a/app/controllers/admin/background_jobs_controller.rb +++ b/app/controllers/admin/background_jobs_controller.rb @@ -1,6 +1,6 @@ class Admin::BackgroundJobsController < Admin::ApplicationController def show - ps_output, _ = Gitlab::Popen.popen(%W(ps -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command)) + 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/) @concurrency = Sidekiq.options[:concurrency] end |