diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-20 11:22:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-20 11:22:13 +0000 |
| commit | dc303fe2dbc422b71e61897443741f78f0138e82 (patch) | |
| tree | 434bbd54e20317280757fce43aa52a5a23ca7572 /app/controllers/admin | |
| parent | f8a736d028c09927454c86a9e192dadc6d1e2600 (diff) | |
| parent | bfb686bd08a165c0385dbe5f962f532c7ba59b63 (diff) | |
| download | gitlab-ce-dc303fe2dbc422b71e61897443741f78f0138e82.tar.gz | |
Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job_page' into 'master'
fix incorrect sidekiq concurrency count in admin background page
Closes #19862
See merge request !9359
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/background_jobs_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/background_jobs_controller.rb b/app/controllers/admin/background_jobs_controller.rb index 338496013a0..c09095b9849 100644 --- a/app/controllers/admin/background_jobs_controller.rb +++ b/app/controllers/admin/background_jobs_controller.rb @@ -2,5 +2,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)) @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/) + @concurrency = Sidekiq.options[:concurrency] end end |