unicorn-wrangler 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71bee49e7a7465805c10eee3e28597ed216727b6
-  data.tar.gz: f19c67dbc73080d46de86a01a4142868569745ac
+  metadata.gz: cb60fbb2e08b91127b6efbfba149c02ef9e004ec
+  data.tar.gz: 59d7bd41e7344bd76e08694ec8058c7e14663d91
 SHA512:
-  metadata.gz: 0aa20517db73067e8dbaaa3aadb35c355c3e9f8e5abe2ebdde07c64b6c87cf935893271a43ce5535475de6210bdee98c0b674ca42f8c6677b89948ca76985d35
-  data.tar.gz: cf19b3a4c8d5b1861aee2d48356ab0bc1c4af868b3ea1231e2d1b3d3a74e668bcc6fd6e15c27690647b60e6d538d90a65ae8bd444c578da7c523e2cdc4f47457
+  metadata.gz: be04b0fce682d909b425db984789f224fb75b8ff8767268a60de2ac1c4775c39e37d5d36a749b058451a8de9dd4146c7ea4742ab56c0c972c375935b17962707
+  data.tar.gz: 61d6841bbfe9997c9a3578bd405a3e7e42033b8f724f05f4a5614d94d257329b8229568f5320b65fbccea128e70fc230625a18c313c3c12f94ecc793544d1412

data/bin/unicorn-wrangler

@@ -16,6 +16,10 @@ OptionParser.new do |opts|
   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
+  end
 end.parse!(ARGV[0...command_index])
 
 launcher = Unicorn::Wrangler.new command, options

data/lib/unicorn/wrangler.rb

@@ -8,12 +8,13 @@ module Unicorn
       @command = command
       @pidfile = File.expand_path(options[:pidfile] || 'unicorn.pid')
       @startup_period = options[:startup] || 60
+      @keep_unicorn = options[:keep_unicorn]
     end
 
     def start
       trap_signals(:HUP) { restart_unicorn }
       trap_signals(:QUIT, :INT, :TERM) do |signal|
-        Process.kill signal, unicorn_pid if unicorn_running?
+        Process.kill signal, unicorn_pid if unicorn_running? && !@keep_unicorn
         exit
       end
 

data/lib/unicorn/wrangler/version.rb

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

data/spec/lib/unicorn/wrangler_spec.rb

@@ -18,8 +18,8 @@ describe Unicorn::Wrangler do
     sleep 1
   end
 
-  def start_wrangler
-    @wrangler_pid = Process.spawn "#{wrangler_path} --startup-time 1 -p spec/support/unicorn.pid -- #{unicorn_cmd}"
+  def start_wrangler(extra = '')
+    @wrangler_pid = Process.spawn "#{wrangler_path} --startup-time 1 #{extra} -p spec/support/unicorn.pid -- #{unicorn_cmd}"
     sleep 1
   end
 
@@ -146,6 +146,33 @@ 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-wrangler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tom Ward