pushapp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581802672a70b770190de57da287d0b9a642b729
-  data.tar.gz: ff36bd457647002226a93f6e1333fe6595bfe945
+  metadata.gz: 98a8bbfa81a6ec450adb340f2d5c8210b265ed4b
+  data.tar.gz: c188d207ccc5b569cb5c46a239679e38ee24e8c1
 SHA512:
-  metadata.gz: 6d180c3770161ae1b9902bbd472c012c6f4b7891065d0f8f36dcf9e5d2d0ce443d293bace1fa40654a3724dbeaaf9c2e99e1f9c5967d3238d7db5d6544ef5d2d
-  data.tar.gz: 65fe24e674fdfbe7b07dd6a8a4aa761f87ce0689353f0b113e1c44c693510ac5b9d7bd1a6a73bb16ed6b89cf887380e85f541721951af8dce6d03b973b4a9fe8
+  metadata.gz: 03bb4b8fbd3fe162315affabdb4aa6b18c3249b2ed9bc4579384fc782e9224dfcb15ed9efdd00bca05a3bb022a613d8831b5e4ccab0e6582d54f61784979e3c1
+  data.tar.gz: df2a3f65d229521cf013be4a56f37eadde3893fec76d6783781f5ce86120b1c4a688ee6fc262d3a5e2098fc5cc93cb0ab07a1ba2b32eb5eeb8c2b4f1cc75ac7c

data/lib/pushapp/generators.rb

@@ -49,7 +49,7 @@ module Pushapp
       template 'unicorn.rb.erb', 'config/unicorn.rb'
     end
 
-    desc 'chef-solor REMOTE', 'generates chef solo with knife solo configs'
+    desc 'chef-solo REMOTE', 'generates chef solo with knife solo configs'
     method_option :database,
       type: :string,
       default: 'postgresql',

data/lib/pushapp/version.rb

@@ -1,3 +1,3 @@
 module Pushapp
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/templates/unicorn_upstart.erb

@@ -1,13 +1,23 @@
 #!/bin/bash
 
-if [ -f tmp/pids/unicorn.pid ]; then
-  unicorn_pid_file=tmp/pids/unicorn.pid
+unicorn_pid_file=tmp/pids/unicorn.pid
+
+if [ -f $unicorn_pid_file ]; then
   # Someone restarted the master; wait for the new master to exit.
-  PID=`cat $unicorn_pid_file`
 
-  while kill -0 $PID; do
+  function graceful_shutdown {
+    echo "Initializing graceful shutdown"
+    kill -QUIT `cat $unicorn_pid_file`
+
+    # Git unicorn some time to stop
+    sleep 1
+  }
+
+  # Trap upstart stop (TERM) and send QUIT to unicorn
+  trap graceful_shutdown TERM
+
+  while [ -f $unicorn_pid_file ] && kill -0 `cat $unicorn_pid_file`; do
     sleep 2
-    PID=`cat $unicorn_pid_file`
   done
 
   # If we get here, the master has exited, either because someone restarted
@@ -16,8 +26,8 @@ if [ -f tmp/pids/unicorn.pid ]; then
   # The sleep above is a tradeoff between polling load and mimizing the
   # restart delay when the master dies for real (which should hopefully be
   # rare).
-  rm $unicorn_pid_file
+  rm -f $unicorn_pid_file
 else
   # Run the unicorn master process (this won't return until it exits).
-  bundle exec unicorn -E $RAILS_ENV -c config/unicorn.rb
+  exec bundle exec unicorn -E $RAILS_ENV -c config/unicorn.rb
 fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushapp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yury Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor