capistrano-deploy-management 0.1.36 → 0.1.37

data/capistrano-deploy-management.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.name        = 'capistrano-deploy-management'
   s.description = 'Collection of Capistrano recipes for deploying Rails apps into high-performance environments'
-  s.version     = '0.1.36'
+  s.version     = '0.1.37'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Dominik Rodler']
   s.email       = ['dominik.rodler@gmail.com']

data/changelog.md

@@ -1,3 +1,6 @@
+- 0.1.37
+  try to fix stopping and restarting of unicorn
+
 - 0.1.34 / 0.1.35 / 0.1.36
   start unicon using bundle exec
 

data/lib/capistrano-deploy-management/unicorn.rb

@@ -4,16 +4,18 @@ module CapistranoDeployManagement
       configuration.load do
 
         set(:unicorn_config)  { "#{current_path}/config/unicorn.rb" }
-        set(:unicorn_pidfile) { "#{deploy_to}/shared/pids/unicorn.pid" }
-        set(:unicorn_pid)     { "cat #{deploy_to}/shared/pids/unicorn.pid" }
+        # FIXME: Restarting fails, because PID does not exist -> symlink already points to new, empty folder
+        # set(:unicorn_pidfile) { "#{deploy_to}/shared/pids/unicorn.pid" }
+        # set(:unicorn_pid)     { "cat #{deploy_to}/shared/pids/unicorn.pid" }
+        set(:unicorn_pidfile) { "#{previous_release}/tmp/pids/unicorn.pid" }
+        set(:unicorn_pid)     { "cat #{previous_release}/tmp/pids/unicorn.pid" }
 
         namespace :unicorn do
           desc 'Restart unicorn.'
           task :restart, :roles => :app do
-            # FIXME: PID does not exist, thus restarting fails
-            # run "#{try_sudo} kill -s USR2 $(#{unicorn_pid})"
-            unicorn.stop
-            unicorn.start
+            run "if [ -f #{unicorn_pidfile} ] && [ -e $(#{unicorn_pid}) ]; then #{try_sudo} kill -s USR2 $(#{unicorn_pid}); else cd #{current_path} && bundle exec unicorn -c #{unicorn_config} -E #{rails_env} -D; fi"
+            # unicorn.stop
+            # unicorn.start
           end
 
           desc 'Start unicorn.'
@@ -23,7 +25,7 @@ module CapistranoDeployManagement
 
           desc 'Stop unicorn.'
           task :stop, :roles => :app do
-            run "cd #{current_path} && test -s #{unicorn_pidfile} && #{try_sudo} kill $(#{unicorn_pid}) || echo 'Unicorn not running. Nothing to kill.'"
+            run "cd #{current_path} && test -s #{unicorn_pidfile} && #{try_sudo} kill -QUIT $(#{unicorn_pid}) || echo 'Unicorn not running. Nothing to kill.'"
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-deploy-management
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano