unicorn-wrangler 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c453420ee8fd0c8d01dc9226450e39d2223388c
-  data.tar.gz: 535e8fb3e3c75539a811f396127d3a4b00e78e9b
+  metadata.gz: 71bee49e7a7465805c10eee3e28597ed216727b6
+  data.tar.gz: f19c67dbc73080d46de86a01a4142868569745ac
 SHA512:
-  metadata.gz: b0b31942c67f3e15db8fd0724b5d363cee9f5f2807be1927dea4e84981b04826ff229bbb77dbf08d31746c96ed6603be4f50b5f9eb1b438dccef7e973a920bd3
-  data.tar.gz: 1e8e6520147bb560d52cc49c415f1beb68188cc6d7269b71e34a7eaa45511168d8d6037d598fb835c8d1e0a94a9c6524f398b3d3ca931b49b564e52661fbeb66
+  metadata.gz: 0aa20517db73067e8dbaaa3aadb35c355c3e9f8e5abe2ebdde07c64b6c87cf935893271a43ce5535475de6210bdee98c0b674ca42f8c6677b89948ca76985d35
+  data.tar.gz: cf19b3a4c8d5b1861aee2d48356ab0bc1c4af868b3ea1231e2d1b3d3a74e668bcc6fd6e15c27690647b60e6d538d90a65ae8bd444c578da7c523e2cdc4f47457

data/lib/unicorn/wrangler.rb

@@ -11,7 +11,11 @@ module Unicorn
     end
 
     def start
-      trap_signals(:QUIT, :INT, :TERM) { exit }
+      trap_signals(:HUP) { restart_unicorn }
+      trap_signals(:QUIT, :INT, :TERM) do |signal|
+        Process.kill signal, unicorn_pid if unicorn_running?
+        exit
+      end
 
       if unicorn_running?
         restart_unicorn
@@ -31,6 +35,7 @@ module Unicorn
     def trap_signals(*signals, &block)
       signals.map(&:to_s).each do |signal|
         trap(signal) do
+          puts "unicorn-wrangler #{Process.pid} received #{signal} (managing #{unicorn_pid})"
           block.call signal
         end
       end

data/lib/unicorn/wrangler/version.rb

@@ -1,5 +1,5 @@
 module Unicorn
   class Wrangler
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/lib/unicorn/wrangler_spec.rb

@@ -54,25 +54,47 @@ describe Unicorn::Wrangler do
       start_wrangler
     end
 
-    it 'quits (but leaves unicorn running) on receiving QUIT signal' do
+    context 'on receiving HUP signal' do
+      before do
+        @original_pid = unicorn_pid
+        @original_response = perform_request
+        Process.kill :HUP, @wrangler_pid
+      end
+
+      it 'restarts unicorn on startup' do
+        sleep 3
+        unicorn_pid.should_not eql(@original_pid)
+      end
+
+      it 'continues serving requests from both unicorns' do
+        20.times.map { sleep 0.1; perform_request }.uniq.size.should eql(2)
+      end
+
+      it 'stops serving requests from original unicorn' do
+        sleep 3
+        perform_request.should_not eql(@original_response)
+      end
+    end
+
+    it 'quits on receiving QUIT signal' do
       Process.kill 'QUIT', @wrangler_pid
       sleep 1
       wrangler_running?.should_not be_true
-      unicorn_running?.should be_true
+      unicorn_running?.should_not be_true
     end
 
-    it 'quits (but leaves unicorn running) on receiving TERM signal' do
+    it 'quits on receiving TERM signal' do
       Process.kill 'TERM', @wrangler_pid
       sleep 1
       wrangler_running?.should_not be_true
-      unicorn_running?.should be_true
+      unicorn_running?.should_not be_true
     end
 
-    it 'quits (but leaves unicorn running) on receiving INT signal' do
+    it 'quits on receiving INT signal' do
       Process.kill 'INT', @wrangler_pid
       sleep 1
       wrangler_running?.should_not be_true
-      unicorn_running?.should be_true
+      unicorn_running?.should_not be_true
     end
 
     it 'quits if monitored unicorn process quits' do
@@ -81,7 +103,7 @@ describe Unicorn::Wrangler do
       wrangler_running?.should_not be_true
     end
 
-    it 'continues running after launch (so that process monitoring tools do not restart it)' do
+    it 'continues running unless unicorn process quits' do
       sleep 3
       wrangler_running?.should be_true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-wrangler
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tom Ward