Commit 5b0abbcbc3dd368ecca4c55432d287de9a1838ef

Authored by Johannes Schleifenbaum
1 parent 253850dd

Show only processes owned by the GitLab user on the Admin-Sidekiq page

See the Pull-Request #5191
app/views/admin/background_jobs/show.html.haml
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 .ui-box 3 .ui-box
4 %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"} 4 %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
5 %h4 Sidekiq running processes 5 %h4 Sidekiq running processes
6 -- sidekiq_processes = `ps -eo euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep` 6 +- sidekiq_processes = `ps -U #{Settings.gitlab.user} -o euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep`
7 - if sidekiq_processes.empty? 7 - if sidekiq_processes.empty?
8 %b There are no running sidekiq processes 8 %b There are no running sidekiq processes
9 %b Please restart GitLab 9 %b Please restart GitLab