Download as
Browse Code »

Commit 7cd03836e55f842fd518b4637c19235ee8701f17

Authored by Riyad Preukschas
1 parent 4eac403e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix sidekiq check task

Showing 1 changed file with 7 additions and 9 deletions   Show diff stats
lib/tasks/gitlab/check.rake
  Diff comments   View file @7cd0383
... ... @@ -2,7 +2,7 @@ namespace :gitlab do
2 2 desc "GITLAB | Check the configuration of GitLab and its environment"
3 3 task check: %w{gitlab:env:check
4 4 gitlab:gitolite:check
5   - gitlab:resque:check
  5 + gitlab:sidekiq:check
6 6 gitlab:app:check}
7 7  
8 8  
... ... @@ -870,22 +870,22 @@ namespace :gitlab do
870 870  
871 871  
872 872  
873   - namespace :resque do
  873 + namespace :sidekiq do
874 874 desc "GITLAB | Check the configuration of Sidekiq"
875 875 task check: :environment do
876 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 882 end
883 883  
884 884  
885 885 # Checks
886 886 ########################
887 887  
888   - def check_resque_running
  888 + def check_sidekiq_running
889 889 print "Running? ... "
890 890  
891 891 if run_and_match("ps aux | grep -i sidekiq", /sidekiq \d\.\d\.\d.+$/)
... ... @@ -893,9 +893,7 @@ namespace :gitlab do
893 893 else
894 894 puts "no".red
895 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 898 for_more_information(
901 899 see_installation_guide_section("Install Init Script"),
... ...