upstart-unicorn-launcher 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcfcecdaacbb99d28cb3ba75e37e0f2f77aa7180
-  data.tar.gz: 7f9384d07859a01267cfc0e3e00b10e2825aa10e
+  metadata.gz: 81675d74f21b08aa061a2ce4beaed5b6c9370961
+  data.tar.gz: acc2ca0094d53dcd461f0dd9f39bd259b10b344a
 SHA512:
-  metadata.gz: 264cfee8d9ba752f70a878de25dbcd19716c1dfd858dbb66832e9bdc00f6857432719edf9b00320e78918897e0a1b5e66258dd6bf109aba88bc389b3a6de4b30
-  data.tar.gz: 599e9ce3cc01913b01b96ea04e3dfefba648662aba7aaa2f3625c1044effaa58a4e0c4a14801f00abe48d411af274ddfba06493f774f414aff678bce4638e5f4
+  metadata.gz: 8fb5f6084e831a664202ea5dc0a61620ad054c928c601a9b192dffe0631e7720ee7c983a86c71f86ed5027a47ea782405ad51fb4891c7017a20acfc3b5d6e799
+  data.tar.gz: 3aa5c4869908646138cc1781606b99210cd9e6b2bcd7816e760ea5ef47dc170d3294d566f0470e52b92f64197f08d864e37c651c78acc160ce80c1828db6d72f

data/lib/upstart_unicorn_launcher.rb

@@ -17,7 +17,9 @@ class UpstartUnicornLauncher
     quit_server_on :QUIT, :INT, :TERM
     forward_to_server :USR1, :USR2, :WINCH, :TTIN, :TTOU
     start_server
-    wait_until_server_quits
+    loop do
+      sleep 1
+    end
   end
 
   private
@@ -25,45 +27,39 @@ class UpstartUnicornLauncher
   def start_server
     abort "The unicorn pidfile '#{pidfile}' already exists.  Is the server running already?" if File.exist?(pidfile)
     spawned_pid = Process.spawn command
-    wait_for { File.exist?(pidfile) }
+    wait_for_with_timeout { File.exist?(pidfile) }
   rescue Timeout::Error
     Process.kill "QUIT", spawned_pid
     abort "Unable to find server running with pidfile #{pidfile}.  Exiting"
   end
 
   def restart_server_on(*signals)
-    signals.each do |signal|
-      debug "Received #{signal}, restarting server"
-      trap(signal.to_s) { restart_server }
+    trap_signals("restarting server", *signals) do
+      restart_server
     end
   end
 
   def quit_server_on(*signals)
-    signals.each do |signal|
-      trap(signal.to_s) do
-        debug "Received #{signal}, quitting server"
-        Process.kill signal.to_s, pid
-        wait_until_server_quits
-        exit
-      end
+    trap_signals("quitting server", *signals) do |signal|
+      Process.kill signal, pid
+      wait_until_server_quits
+      exit
     end
   end
 
   def forward_to_server(*signals)
-    signals.each do |signal|
-      trap(signal.to_s) do
-        debug "Forwarding #{signal} to #{pid}"
-        Process.kill signal.to_s, pid
-      end
+    trap_signals("forwarding", *signals) do |signal|
+      Process.kill signal, pid
     end
   end
 
   def wait_until_server_quits
-    wait_for { !running? }
+    wait_for_with_timeout { !running? }
   end
 
   def restart_server
     reexecute_running_binary
+    wait_for_with_timeout { old_pid }
     wait_for_server_to_start
     quit_old_master
   end
@@ -105,10 +101,23 @@ class UpstartUnicornLauncher
     end
   end
 
-  def wait_for(timeout = 20, &block)
+  def wait_for(&block)
+    until block.call
+      sleep tick_period
+    end
+  end
+
+  def wait_for_with_timeout(timeout = 20, &block)
     Timeout::timeout timeout do
-      until block.call
-        sleep tick_period
+      wait_for(&block)
+    end
+  end
+
+  def trap_signals(message, *signals, &block)
+    signals.map(&:to_s).each do |signal|
+      trap(signal) do
+        debug "Received #{signal}, #{message}"
+        block.call signal
       end
     end
   end

data/lib/upstart_unicorn_launcher/version.rb

@@ -1,3 +1,3 @@
 class UpstartUnicornLauncher
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-module ProjectSupport
+module SpecHelper
   def perform_request
     response = Curl::Easy.perform('http://localhost:7516')
   end
@@ -17,8 +17,9 @@ module ProjectSupport
     puts "Killing #{@launcher_pid}"
     Process.kill "QUIT", @launcher_pid
   end
-end
 
-RSpec.configure do |config|
-  config.include ProjectSupport
+  RSpec.configure do |config|
+    config.include self
+  end
 end
+

data/spec/upstart_integration_spec.rb

@@ -6,6 +6,12 @@ describe 'Upstart integration' do
     kill_launcher
   end
 
+  after :all do
+    if File.exist?('spec/templates/test/unicorn.pid')
+      Process.kill "QUIT", File.read('spec/templates/test/unicorn.pid').to_i
+    end
+  end
+
   it 'starts server' do
     start_launcher
     expect {perform_request}.to_not raise_error

metadata

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