summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorSebastian Reitenbach <sebastia@l00-bugdead-prods.de>2017-03-26 08:58:49 +0200
committerSebastian Reitenbach <sebastia@l00-bugdead-prods.de>2017-03-28 23:15:17 +0200
commitd8569440b5008f9cd383515d5dce3bf8730bbef6 (patch)
treeaff2556e9124493162dd8b720cb550cabf168ebf /app/controllers/admin
parentc82ddfe24a1a14596caf2f9ca4a6fdb521942f1c (diff)
downloadgitlab-ce-d8569440b5008f9cd383515d5dce3bf8730bbef6.tar.gz
There might be ps utilities out there, that assume 80chars instead
of unlimited width if they cannot detect terminal size, therefore force unlimited terminal size when checking processes via ps.
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/background_jobs_controller.rb2
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