cap_unicorn 0.0.6 → 0.0.7

data/lib/cap_unicorn/recipes.rb

@@ -5,7 +5,15 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     def self.master_pid
-      pid = capture "pid=$(ps aux | grep #{command_name} | grep master | grep -v grep | grep #{current_path}); echo $pid"
+      pid = capture "pid=$(ps aux | grep #{command_name} | grep master | grep -v '(old)' | grep -v grep | grep #{current_path}); echo $pid"
+
+      unless pid.empty?
+        pid.split(" ")[1]
+      end
+    end
+
+    def self.old_master_pid
+      pid = capture "pid=$(ps aux | grep #{command_name} | grep master | grep '(old)' | grep -v grep | grep #{current_path}); echo $pid"
 
       unless pid.empty?
         pid.split(" ")[1]
@@ -21,6 +29,23 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :restart do
       if pid = master_pid
         run "kill -s USR2 #{pid}"
+
+        loop do
+          puts "Searching for newly spawned master process..."
+
+          if pid = master_pid
+            puts "Found new master process..."
+
+            if old_pid = old_master_pid
+              run "kill -s WINCH #{old_pid}"
+              run "kill -s QUIT  #{old_pid}"
+            end
+
+            break
+          end
+
+          sleep 1
+        end
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cap_unicorn
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Scott Taylor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 -04:00
+date: 2010-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: []