From ad61eec876d800e2c661b598c6da398157b468ec Mon Sep 17 00:00:00 2001
From: "Timothy N. Tsvetkov" <timothy.tsvetkov@gmail.com>
Date: Mon, 11 Apr 2011 20:51:54 +0400
Subject: [PATCH] added dj to deploy (starting only one worker for now)

---
 config/deploy.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 9e6583f78..e1242959a 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -34,24 +34,27 @@ task :symlink_config_files do
   run "mkdir -p #{deploy_to}/#{shared_dir}/config"
 
   run "yes n | cp -i #{release_path}/config/database.yml.sample #{deploy_to}/#{shared_dir}/config/database.yml"
-#  run "yes n | cp -i #{release_path}/config/config.yml.sample #{deploy_to}/#{shared_dir}/config/config.yml"
   run "yes n | cp -i #{release_path}/config/application.yml.sample #{deploy_to}/#{shared_dir}/config/application.yml"
 
 
   run "ln -nfs #{deploy_to}/#{shared_dir}/config/database.yml #{release_path}/config/database.yml"
-#  run "ln -nfs #{deploy_to}/#{shared_dir}/config/config.yml #{release_path}/config/config.yml"
   run "ln -nfs #{deploy_to}/#{shared_dir}/config/application.yml #{release_path}/config/application.yml"
-
 end
 
 namespace :deploy do
   desc "Restarting mod_rails with restart.txt"
   task :restart, :roles => :app, :except => { :no_release => true } do
     run "cd #{deploy_to}/current ; ([ -f tmp/pids/unicorn.pid ] && kill -USR2 `cat tmp/pids/unicorn.pid`); true"
+    restart_dj
   end
 
   %w(start).each { |name| task name, :roles => :app do deploy.restart end }
 
+  desc "Restart delayed job"
+  task :restart_dj, :roles => :web do
+    run "cd #{deploy_to}/current ; RAILS_ENV=production ./script/delayed_job stop; RAILS_ENV=production ./script/delayed_job start; true"
+  end
+
   desc "Rude restart application"
   task :rude_restart, :roles => :web do
     run "cd #{deploy_to}/current ; pkill unicorn; sleep 0.5; pkill -9 unicorn; sleep 0.5 ; unicorn_rails -c config/unicorn.rb -E production -D "
@@ -64,9 +67,7 @@ namespace :deploy do
     envs         = "RAILS_ENV=production"
 
     # Precaching assets
-    run_locally "bash -c '" +
-#      "#{envs} compass compile && " +
-      "#{envs} jammit'"
+    run_locally "bash -c '#{envs} jammit'"
 
     # Uploading prechached assets
     top.upload assets_path, "#{current_release}/public", :via => :scp, :recursive => true