Commit 7cd03836e55f842fd518b4637c19235ee8701f17
1 parent
4eac403e
Exists in
master
and in
4 other branches
Fix sidekiq check task
Showing
1 changed file
with
7 additions
and
9 deletions
Show diff stats
lib/tasks/gitlab/check.rake
| @@ -2,7 +2,7 @@ namespace :gitlab do | @@ -2,7 +2,7 @@ namespace :gitlab do | ||
| 2 | desc "GITLAB | Check the configuration of GitLab and its environment" | 2 | desc "GITLAB | Check the configuration of GitLab and its environment" |
| 3 | task check: %w{gitlab:env:check | 3 | task check: %w{gitlab:env:check |
| 4 | gitlab:gitolite:check | 4 | gitlab:gitolite:check |
| 5 | - gitlab:resque:check | 5 | + gitlab:sidekiq:check |
| 6 | gitlab:app:check} | 6 | gitlab:app:check} |
| 7 | 7 | ||
| 8 | 8 | ||
| @@ -870,22 +870,22 @@ namespace :gitlab do | @@ -870,22 +870,22 @@ namespace :gitlab do | ||
| 870 | 870 | ||
| 871 | 871 | ||
| 872 | 872 | ||
| 873 | - namespace :resque do | 873 | + namespace :sidekiq do |
| 874 | desc "GITLAB | Check the configuration of Sidekiq" | 874 | desc "GITLAB | Check the configuration of Sidekiq" |
| 875 | task check: :environment do | 875 | task check: :environment do |
| 876 | warn_user_is_not_gitlab | 876 | warn_user_is_not_gitlab |
| 877 | - start_checking "Resque" | 877 | + start_checking "Sidekiq" |
| 878 | 878 | ||
| 879 | - check_resque_running | 879 | + check_sidekiq_running |
| 880 | 880 | ||
| 881 | - finished_checking "Resque" | 881 | + finished_checking "Sidekiq" |
| 882 | end | 882 | end |
| 883 | 883 | ||
| 884 | 884 | ||
| 885 | # Checks | 885 | # Checks |
| 886 | ######################## | 886 | ######################## |
| 887 | 887 | ||
| 888 | - def check_resque_running | 888 | + def check_sidekiq_running |
| 889 | print "Running? ... " | 889 | print "Running? ... " |
| 890 | 890 | ||
| 891 | if run_and_match("ps aux | grep -i sidekiq", /sidekiq \d\.\d\.\d.+$/) | 891 | if run_and_match("ps aux | grep -i sidekiq", /sidekiq \d\.\d\.\d.+$/) |
| @@ -893,9 +893,7 @@ namespace :gitlab do | @@ -893,9 +893,7 @@ namespace :gitlab do | ||
| 893 | else | 893 | else |
| 894 | puts "no".red | 894 | puts "no".red |
| 895 | try_fixing_it( | 895 | try_fixing_it( |
| 896 | - "sudo service gitlab restart", | ||
| 897 | - "or", | ||
| 898 | - "sudo /etc/init.d/gitlab restart" | 896 | + "sudo -u gitlab -H bundle exec rake sidekiq:start" |
| 899 | ) | 897 | ) |
| 900 | for_more_information( | 898 | for_more_information( |
| 901 | see_installation_guide_section("Install Init Script"), | 899 | see_installation_guide_section("Install Init Script"), |