diff options
| author | wendy0402 <wendykurniawan92@gmail.com> | 2017-02-19 15:15:30 +0700 |
|---|---|---|
| committer | wendy0402 <wendykurniawan92@gmail.com> | 2017-02-19 15:15:30 +0700 |
| commit | a29fbc213ca192af9994f61b67990172b9640855 (patch) | |
| tree | eec663db657e721dbbdc13e360cdebf36b1e218b /app/controllers | |
| parent | 6eb45df2fd62c85920c3ef025d7dacadcda05bf4 (diff) | |
| download | gitlab-ce-a29fbc213ca192af9994f61b67990172b9640855.tar.gz | |
fix incorrect sidekiq concurrency count in admin background page
Diffstat (limited to 'app/controllers')
| -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 |