unicorn-wrangler 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb60fbb2e08b91127b6efbfba149c02ef9e004ec
-  data.tar.gz: 59d7bd41e7344bd76e08694ec8058c7e14663d91
+  metadata.gz: 07223bd2cd439dbd81d9e6c7682dbef99d13af05
+  data.tar.gz: c75917973a88533513a353c7f548095c02071f1d
 SHA512:
-  metadata.gz: be04b0fce682d909b425db984789f224fb75b8ff8767268a60de2ac1c4775c39e37d5d36a749b058451a8de9dd4146c7ea4742ab56c0c972c375935b17962707
-  data.tar.gz: 61d6841bbfe9997c9a3578bd405a3e7e42033b8f724f05f4a5614d94d257329b8229568f5320b65fbccea128e70fc230625a18c313c3c12f94ecc793544d1412
+  metadata.gz: 66ae9fced46e50425249002ed43216eded8ccc76c40174b20e70ccfe70b3c7f10d0fac5d470f8d653314d1ae11550695a73f10b6c14222d9bbe60f26cc6fc301
+  data.tar.gz: 8ac25f925bcb4b6c01a3f6ac4827e693c1df510972f2ecc20910098f31e18e88e801589a5b5b454316a307c2ab68d3cd7cdf0e21d5d551c888ee58592e47934e

data/bin/unicorn-wrangler

@@ -13,12 +13,8 @@ OptionParser.new do |opts|
     options[:pidfile] = pidfile
   end
 
-  opts.on("-s", "--startup-time STARTUP", "Time to wait for server to start") do |time|
-    options[:startup] = time.to_i
-  end
-
-  opts.on("-k", "--keep-unicorn-running", "Keep unicorn running on exit") do
-    options[:keep_unicorn] = true
+  opts.on("-g", "--grace-period PERIOD", "Time to wait before shutting down server") do |time|
+    options[:grace_period] = time.to_i
   end
 end.parse!(ARGV[0...command_index])
 

data/lib/unicorn/wrangler.rb

@@ -2,19 +2,18 @@ require "unicorn/wrangler/version"
 
 module Unicorn
   class Wrangler
-    attr_reader :command, :pidfile, :startup_period, :tick_period, :verbose
+    attr_reader :command, :pidfile, :grace_period
 
     def initialize(command, options = {})
       @command = command
       @pidfile = File.expand_path(options[:pidfile] || 'unicorn.pid')
-      @startup_period = options[:startup] || 60
-      @keep_unicorn = options[:keep_unicorn]
+      @grace_period = options[:grace_period] || 60
     end
 
     def start
       trap_signals(:HUP) { restart_unicorn }
       trap_signals(:QUIT, :INT, :TERM) do |signal|
-        Process.kill signal, unicorn_pid if unicorn_running? && !@keep_unicorn
+        kill_unicorn_after_delay
         exit
       end
 
@@ -46,7 +45,7 @@ module Unicorn
       original_pid = unicorn_pid
       Process.kill "USR2", unicorn_pid
       wait_for { unicorn_pid != original_pid }
-      sleep startup_period
+      sleep grace_period
       Process.kill "TERM", original_pid
     end
 
@@ -65,5 +64,16 @@ module Unicorn
         sleep 0.1
       end
     end
+
+    def kill_unicorn_after_delay
+      if unicorn_running?
+        puts "Preparing to kill unicorn in #{grace_period} seconds"
+        unless fork
+          Process.setsid
+          sleep grace_period
+          Process.kill :TERM, unicorn_pid if unicorn_running?
+        end
+      end
+    end
   end
 end

data/lib/unicorn/wrangler/version.rb

@@ -1,5 +1,5 @@
 module Unicorn
   class Wrangler
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/lib/unicorn/wrangler_spec.rb

@@ -19,7 +19,7 @@ describe Unicorn::Wrangler do
   end
 
   def start_wrangler(extra = '')
-    @wrangler_pid = Process.spawn "#{wrangler_path} --startup-time 1 #{extra} -p spec/support/unicorn.pid -- #{unicorn_cmd}"
+    @wrangler_pid = Process.spawn "#{wrangler_path} --grace-period 1 -p spec/support/unicorn.pid -- #{unicorn_cmd}"
     sleep 1
   end
 
@@ -76,23 +76,23 @@ describe Unicorn::Wrangler do
       end
     end
 
-    it 'quits on receiving QUIT signal' do
+    it 'exits on receiving QUIT signal' do
       Process.kill 'QUIT', @wrangler_pid
-      sleep 1
+      sleep 2
       wrangler_running?.should_not be_true
       unicorn_running?.should_not be_true
     end
 
-    it 'quits on receiving TERM signal' do
+    it 'exits on receiving TERM signal' do
       Process.kill 'TERM', @wrangler_pid
-      sleep 1
+      sleep 2
       wrangler_running?.should_not be_true
       unicorn_running?.should_not be_true
     end
 
-    it 'quits on receiving INT signal' do
+    it 'exits on receiving INT signal' do
       Process.kill 'INT', @wrangler_pid
-      sleep 1
+      sleep 2
       wrangler_running?.should_not be_true
       unicorn_running?.should_not be_true
     end
@@ -146,33 +146,6 @@ describe Unicorn::Wrangler do
     end
   end
 
-  context 'when passed the --keep-unicorn flag' do
-    before :each do
-      start_wrangler '--keep-unicorn'
-    end
-
-    it 'keeps unicorn running after receiving QUIT signal' do
-      Process.kill 'QUIT', @wrangler_pid
-      sleep 1
-      wrangler_running?.should_not be_true
-      unicorn_running?.should be_true
-    end
-
-    it 'keeps unicorn running after receiving TERM signal' do
-      Process.kill 'TERM', @wrangler_pid
-      sleep 1
-      wrangler_running?.should_not be_true
-      unicorn_running?.should be_true
-    end
-
-    it 'keeps unicorn running after receiving INT signal' do
-      Process.kill 'INT', @wrangler_pid
-      sleep 1
-      wrangler_running?.should_not be_true
-      unicorn_running?.should be_true
-    end
-  end
-
   before :each do
     cleanup_processes
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-wrangler
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tom Ward
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler