Only kill sidekiqs belonging to gitlab user
This commit is contained in:
parent
1a6ba7e640
commit
4017789f5a
1 changed files with 6 additions and 4 deletions
|
@ -289,7 +289,6 @@ namespace :gitlab do
|
||||||
########################
|
########################
|
||||||
|
|
||||||
def check_gitlab_git_config
|
def check_gitlab_git_config
|
||||||
gitlab_user = Gitlab.config.gitlab.user
|
|
||||||
print "Git configured for #{gitlab_user} user? ... "
|
print "Git configured for #{gitlab_user} user? ... "
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
@ -664,8 +663,8 @@ namespace :gitlab do
|
||||||
puts "#{sidekiq_match.length}".red
|
puts "#{sidekiq_match.length}".red
|
||||||
try_fixing_it(
|
try_fixing_it(
|
||||||
'sudo service gitlab stop',
|
'sudo service gitlab stop',
|
||||||
'sudo pkill -f sidekiq',
|
"sudo pkill -u #{gitlab_user} -f sidekiq",
|
||||||
'sleep 10 && sudo pkill -9 -f sidekiq',
|
"sleep 10 && sudo pkill -9 -u #{gitlab_user} -f sidekiq",
|
||||||
'sudo service gitlab start'
|
'sudo service gitlab start'
|
||||||
)
|
)
|
||||||
fix_and_rerun
|
fix_and_rerun
|
||||||
|
@ -709,10 +708,13 @@ namespace :gitlab do
|
||||||
end
|
end
|
||||||
|
|
||||||
def sudo_gitlab(command)
|
def sudo_gitlab(command)
|
||||||
gitlab_user = Gitlab.config.gitlab.user
|
|
||||||
"sudo -u #{gitlab_user} -H #{command}"
|
"sudo -u #{gitlab_user} -H #{command}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def gitlab_user
|
||||||
|
Gitlab.config.gitlab.user
|
||||||
|
end
|
||||||
|
|
||||||
def start_checking(component)
|
def start_checking(component)
|
||||||
puts "Checking #{component.yellow} ..."
|
puts "Checking #{component.yellow} ..."
|
||||||
puts ""
|
puts ""
|
||||||
|
|
Loading…
Reference in a new issue