Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Refs #196] Fix bluepill and DJ option for deploy and restarting

This commit is contained in:
Vladimir Sharshov 2012-02-28 13:41:02 +04:00
parent ab2398de53
commit 5cc32d61c2
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/deploy.rb
View File

@ -62,8 +62,9 @@ namespace :deploy do
end end
after "deploy:update_code", "deploy:symlink_all", "deploy:migrate" after "deploy:update_code", "deploy:symlink_all", "deploy:migrate"
after "deploy:update", "bluepill:quit", "bluepill:start"
after "deploy:setup", "deploy:symlink_pids" after "deploy:setup", "deploy:symlink_pids"
after "deploy:restart", "bluepill:start" # "bluepill:processes:restart_dj" # "bluepill:restart" after "deploy:restart", "bluepill:quit", "bluepill:start"
after "deploy:restart", "deploy:cleanup" after "deploy:restart", "deploy:cleanup"
require 'cape' require 'cape'

5
config/production.pill
View File

@ -9,9 +9,8 @@ Bluepill.application(app_name) do |app|
process.stop_grace_time = 10.seconds process.stop_grace_time = 10.seconds
process.restart_grace_time = 10.seconds process.restart_grace_time = 10.seconds
process.start_command = "/usr/bin/env RAILS_ENV=production script/delayed_job start" process.start_command = "/usr/bin/env ruby script/delayed_job start"
process.stop_command = "/usr/bin/env RAILS_ENV=production script/delayed_job stop" process.stop_command = "/usr/bin/env ruby script/delayed_job stop"
process.restart_command = "/usr/bin/env RAILS_ENV=production script/delayed_job restart"
process.pid_file = File.join(app.working_dir, 'tmp', 'pids', 'delayed_job.pid') process.pid_file = File.join(app.working_dir, 'tmp', 'pids', 'delayed_job.pid')
end end

3
lib/recipes/bluepill.rb
View File

@ -36,7 +36,8 @@ Capistrano::Configuration.instance(:must_exist).load do
end end
desc "Quit bluepill" desc "Quit bluepill"
task :stop, :roles => [:app] do task :quit, :roles => [:app] do
run "cd #{fetch :current_path} && #{try_sudo} #{bluepill_binary} #{fetch :application} stop"
run "cd #{fetch :current_path} && #{try_sudo} #{bluepill_binary} #{fetch :application} quit" run "cd #{fetch :current_path} && #{try_sudo} #{bluepill_binary} #{fetch :application} quit"
end end

1
script/delayed_job
View File

@ -1,5 +1,6 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
ENV['RAILS_ENV'] ||= "production"
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment')) require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
require 'delayed/command' require 'delayed/command'
Delayed::Command.new(ARGV).daemonize Delayed::Command.new(ARGV).daemonize