Commit 1073019d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'sidekiq_restart' of /home/git/repositories/gitlab/gitlabhq

parents fdd64bf3 85123076
...@@ -218,9 +218,7 @@ reload(){ ...@@ -218,9 +218,7 @@ reload(){
kill -USR2 "$wpid" kill -USR2 "$wpid"
echo "Done." echo "Done."
echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..." echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..."
RAILS_ENV=$RAILS_ENV bundle exec rake sidekiq:stop RAILS_ENV=$RAILS_ENV bundle exec rake sidekiq:restart
echo "Starting Sidekiq..."
RAILS_ENV=$RAILS_ENV bundle exec rake sidekiq:start
# Waiting 2 seconds for sidekiq to write it. # Waiting 2 seconds for sidekiq to write it.
sleep 2 sleep 2
status status
......
...@@ -5,16 +5,28 @@ namespace :sidekiq do ...@@ -5,16 +5,28 @@ namespace :sidekiq do
end end
desc "GITLAB | Start sidekiq" desc "GITLAB | Start sidekiq"
task :start do task :start => :restart
system "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1 &"
desc 'GitLab | Restart sidekiq'
task :restart do
if File.exist?(pidfile)
puts 'Shutting down existing sidekiq process.'
Rake::Task['sidekiq:stop'].invoke
puts 'Starting new sidekiq process.'
end
system "bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} -d -L #{log_file} >> #{log_file} 2>&1"
end end
desc "GITLAB | Start sidekiq with launchd on Mac OS X" desc "GITLAB | Start sidekiq with launchd on Mac OS X"
task :launchd do task :launchd do
system "bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{Rails.root.join("log", "sidekiq.log")} 2>&1" system "bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e #{Rails.env} -P #{pidfile} >> #{log_file} 2>&1"
end end
def pidfile def pidfile
Rails.root.join("tmp", "pids", "sidekiq.pid") Rails.root.join("tmp", "pids", "sidekiq.pid")
end end
def log_file
Rails.root.join("log", "sidekiq.log")
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment