summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schleifenbaum <johannes@js-webcoding.de>2013-10-16 09:01:31 +0200
committerJohannes Schleifenbaum <johannes@js-webcoding.de>2013-10-16 09:01:31 +0200
commit5b0abbcbc3dd368ecca4c55432d287de9a1838ef (patch)
tree44521789c2579a6db0505709def350b033600f1b
parent253850dd6d1da28758631f7b1945666fd489c8a5 (diff)
downloadgitlab-ce-5b0abbcbc3dd368ecca4c55432d287de9a1838ef.tar.gz
Show only processes owned by the GitLab user on the Admin-Sidekiq page
See the Pull-Request #5191
-rw-r--r--app/views/admin/background_jobs/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml
index 6bdf2c3cda8..0f7e6df773b 100644
--- a/app/views/admin/background_jobs/show.html.haml
+++ b/app/views/admin/background_jobs/show.html.haml
@@ -3,7 +3,7 @@
.ui-box
%iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
%h4 Sidekiq running processes
-- sidekiq_processes = `ps -eo euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep`
+- sidekiq_processes = `ps -U #{Settings.gitlab.user} -o euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep`
- if sidekiq_processes.empty?
%b There are no running sidekiq processes
%b Please restart GitLab