diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-22 23:47:12 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-22 23:47:12 -0700 |
| commit | d5b259417abbf42b61c7a716caa3f82224126b17 (patch) | |
| tree | 8963dc20ffbbeef0b8f674db8b142e80f2a35a66 | |
| parent | 591421e89d33d241db189b4f2b5597535b38f3cf (diff) | |
| parent | 5b0abbcbc3dd368ecca4c55432d287de9a1838ef (diff) | |
| download | gitlab-ce-d5b259417abbf42b61c7a716caa3f82224126b17.tar.gz | |
Merge pull request #5345 from jojosch/sidekiq-running-procs-infopage
Show only processes owned by the GitLab user on the Admin-Sidekiq page
| -rw-r--r-- | app/views/admin/background_jobs/show.html.haml | 2 |
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 122e952d87a..186d44c4009 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 |