Merge pull request #5345 from jojosch/sidekiq-running-procs-infopage

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

Merge pull request #5345 from jojosch/sidekiq-running-procs-infopage
Show only processes owned by the GitLab user on the Admin-Sidekiq page
Dmitriy Zaporozhets
2 parents 591421e8 5b0abbcb
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
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
...	...	@@ -3,7 +3,7 @@
3	3	.ui-box
4	4	%iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
5	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	7	- if sidekiq_processes.empty?
8	8	%b There are no running sidekiq processes
9	9	%b Please restart GitLab
...	...