diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-09 09:14:05 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-09 09:14:05 +0300 |
| commit | 9773ccc4519c4c35f969248c4e0f13689b631760 (patch) | |
| tree | c8780c4bfcb5135dfc465f2f0d03424501ed3382 /lib | |
| parent | 71bd9568669d18bc04c551a603a04af2ea99328c (diff) | |
| download | gitlab-ce-9773ccc4519c4c35f969248c4e0f13689b631760.tar.gz | |
sidekiq with green tests
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/hooks/post-receive | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/hooks/post-receive b/lib/hooks/post-receive index ebd9e1a028a..6944d3e3f72 100755 --- a/lib/hooks/post-receive +++ b/lib/hooks/post-receive @@ -1,5 +1,6 @@ #!/usr/bin/env bash +# Version 4.1 # This file was placed here by GitLab. It makes sure that your pushed commits # will be processed properly. diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 252b508609a..db181cb9a96 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -871,7 +871,7 @@ namespace :gitlab do namespace :resque do - desc "GITLAB | Check the configuration of Resque" + desc "GITLAB | Check the configuration of Sidekiq" task check: :environment do warn_user_is_not_gitlab start_checking "Resque" @@ -888,7 +888,7 @@ namespace :gitlab do def check_resque_running print "Running? ... " - if run_and_match("ps aux | grep -i resque", /resque-[\d\.]+:.+$/) + if run_and_match("ps aux | grep -i sidekiq", /sidekiq-[\d\.]+:.+$/) puts "yes".green else puts "no".red @@ -899,7 +899,7 @@ namespace :gitlab do ) for_more_information( see_installation_guide_section("Install Init Script"), - "see log/resque.log for possible errors" + "see log/sidekiq.log for possible errors" ) fix_and_rerun end |