kapify 0.0.11 → 0.0.12

data/lib/generators/kapify/unicorn/templates/unicorn.rb.erb

@@ -29,6 +29,25 @@ before_fork do |server, worker|
     end
   end
 
+  # The following is only recommended for memory/DB-constrained
+  # installations.  It is not needed if your system can house
+  # twice as many worker_processes as you have configured.
+  #
+  # # This allows a new master process to incrementally
+  # # phase out the old master process with SIGTTOU to avoid a
+  # # thundering herd (especially in the "preload_app false" case)
+  # # when doing a transparent upgrade.  The last worker spawned
+  # # will then kill off the old master process with a SIGQUIT.
+
+  #old_pid = "#{server.config[:pid]}.oldbin"
+    #if old_pid != server.pid
+      #begin
+        ##sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+        #Process.kill(sig, File.read(old_pid).to_i)
+      #rescue Errno::ENOENT, Errno::ESRCH
+      #end
+    #end
+
   if defined?(Resque)
     Resque.redis.quit
   end
@@ -43,6 +62,6 @@ after_fork do |server, worker|
   end
 
   if defined?(Resque)
-    Resque.redis = 'localhost:6379'
+    Resque.redis.client.reconnect
   end
 end

data/lib/generators/kapify/unicorn/templates/unicorn_init.erb

@@ -55,23 +55,58 @@ restart|reload)
   run "$CMD"
   ;;
 upgrade)
-  if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+  if test -s $PID; then ORIG_PID=`cat $PID`; else ORIG_PID=0; fi
+ 
+  echo 'Original PID: ' $ORIG_PID
+ 
+  if sig USR2
   then
+    echo 'USR2 sent; Waiting for .oldbin'
     n=$TIMEOUT
-    while test -s $OLD_PIN && test $n -ge 0
+    
+    #wait for .oldpid to be written
+    while (!(test -s $OLD_PID) && test $n -ge 0)
+    do
+      printf '.' && sleep 1 && n=$(( $n - 1 ))    
+    done
+    
+    echo 'Waiting for new pid file'
+    #when this loop finishes, should have new pid file
+    while (!(test -s $PID ) || test -s $OLD_PID) && test $n -ge 0
     do
       printf '.' && sleep 1 && n=$(( $n - 1 ))
     done
+ 
+    if test -s $PID
+    then 
+      NEW_PID=`cat $PID`
+    else 
+      echo 'New master failed to start; see error log'
+      exit 1
+    fi
+    
+    #timeout has elapsed, verify new pid file exists
+    if [ $ORIG_PID -eq $NEW_PID ]
+    then
+      echo
+      echo >&2 'New master failed to start; see error log'
+      exit 1
+    fi
+ 
+    echo 'New PID: ' $NEW_PID
+ 
+    #verify old master QUIT
     echo
-
-    if test $n -lt 0 && test -s $OLD_PIN
+    if test -s $OLD_PID
     then
-      echo >&2 "$OLD_PIN still exists after $TIMEOUT seconds"
+      echo >&2 "$OLD_PID still exists after $TIMEOUT seconds"
       exit 1
     fi
+    
+    printf 'Unicorn successfully upgraded'
     exit 0
   fi
-  echo >&2 "Couldn't upgrade, starting '$CMD' instead"
+  echo >&2 "Upgrade failed: executing '$CMD' "
   run "$CMD"
   ;;
 reopen-logs)

data/lib/kapify/base.rb

@@ -41,4 +41,10 @@ Capistrano::Configuration.instance.load do
     put ERB.new(File.read(config_file)).result(binding), target
   end
 
+  def ask_with_default(prompt, default_value)
+    Capistrano::CLI.ui.ask(prompt) do |q|
+      q.default = default_value
+      q.answer_type = ->(res) { res.to_s }
+    end
+  end
 end

data/lib/kapify/version.rb

@@ -1,3 +1,3 @@
 module Kapify
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapify
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4017653492412988607
+      hash: -3028142537426582318
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4017653492412988607
+      hash: -3028142537426582318
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23