diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-09-27 07:22:18 -0700 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-09-27 07:22:18 -0700 |
| commit | 883cb467c5427cbd80e7bc8175032754cf095aa9 (patch) | |
| tree | 509f6af30dbc92ba3463f516a086680f7b2b46a6 | |
| parent | 72dd8011a739356ee66d90a0bb3adcb865495464 (diff) | |
| parent | b5d7bcb7842d7a63de332e998d2c11ba3a5e1e6d (diff) | |
| download | gitlab-ce-883cb467c5427cbd80e7bc8175032754cf095aa9.tar.gz | |
Merge pull request #5191 from jojosch/fix-check-script-sidekiq
[gitlab:check] Fix detecting the status of sidekiq
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 88eb088c911..6e2a59f62ac 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -663,7 +663,6 @@ namespace :gitlab do else puts "#{sidekiq_match.length}".red try_fixing_it( - 'Unless you are running another Rails application on this server there should only be one Sidekiq process.', 'sudo service gitlab stop', 'sudo pkill -f sidekiq', 'sleep 10 && sudo pkill -9 -f sidekiq', @@ -674,7 +673,7 @@ namespace :gitlab do end def sidekiq_process_match - run_and_match("ps aux | grep -i sidekiq", /(sidekiq \d+\.\d+\.\d+.+$)/) + run_and_match("ps ux | grep -i sidekiq", /(sidekiq \d+\.\d+\.\d+.+$)/) end end |