Merge pull request #5191 from jojosch/fix-check-script-sidekiq

[gitlab:check] Fix detecting the status of sidekiq

Merge pull request #5191 from jojosch/fix-check-script-sidekiq
[gitlab:check] Fix detecting the status of sidekiq
Jacob Vosmaer
2 parents 72dd8011 b5d7bcb7
Showing 1 changed file with 1 additions and 2 deletions Show diff stats
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
...	...	@@ -663,7 +663,6 @@ namespace :gitlab do
663	663	else
664	664	puts "#{sidekiq_match.length}".red
665	665	try_fixing_it(
666		- 'Unless you are running another Rails application on this server there should only be one Sidekiq process.',
667	666	'sudo service gitlab stop',
668	667	'sudo pkill -f sidekiq',
669	668	'sleep 10 && sudo pkill -9 -f sidekiq',
...	...	@@ -674,7 +673,7 @@ namespace :gitlab do
674	673	end
675	674
676	675	def sidekiq_process_match
677		- run_and_match("ps aux \| grep -i sidekiq", /(sidekiq \d+\.\d+\.\d+.+$)/)
	676	+ run_and_match("ps ux \| grep -i sidekiq", /(sidekiq \d+\.\d+\.\d+.+$)/)
678	677	end
679	678	end
680	679
...	...