diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2013-10-15 15:28:53 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2013-10-15 15:28:53 +0200 |
| commit | a271570ea9e0e53cf5574a1060d97a55145b583e (patch) | |
| tree | a3df299d46baa8b2591f4c24e3cf91de64a9abaf | |
| parent | 4886d8fd03087ceb07c96c3067120b0c1815354d (diff) | |
| download | gitlab-ce-a271570ea9e0e53cf5574a1060d97a55145b583e.tar.gz | |
Show explanation .
| -rw-r--r-- | app/views/admin/background_jobs/show.html.haml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml index dcc8681cbb5..6bdf2c3cda8 100644 --- a/app/views/admin/background_jobs/show.html.haml +++ b/app/views/admin/background_jobs/show.html.haml @@ -5,7 +5,8 @@ %h4 Sidekiq running processes - sidekiq_processes = `ps -eo euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep` - if sidekiq_processes.empty? - %b There is no running sidekiq process + %b There are no running sidekiq processes + %b Please restart GitLab - else .ui-box %table.zebra-striped @@ -25,9 +26,13 @@ %th COMMAND %th - sidekiq_processes.split("\n").each do |process| + - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/) - data = process.gsub!(/\s+/m, '|').strip.split('|') %tr - 6.times do %td= data.shift %td %td= data.join(" ") + %b If '[25 of 25 busy]' is shown, restart GitLab. + %br + %b If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u git -f sidekiq) and restart GitLab. |