preplay_unicorn 4.3.1.2.gc450 → 4.3.1.5.ga7df

data/Documentation/unicorn.1.txt

@@ -109,12 +109,12 @@ with rackup(1) but strongly discouraged.
 The following UNIX signals may be sent to the master process:
 
 * HUP - reload config file, app, and gracefully restart all workers
-* INT/TERM - quick shutdown, kills all workers immediately
-* QUIT - graceful shutdown, waits for workers to finish their
+* QUIT - quick shutdown, kills all workers immediately
+* INT/TERM - graceful shutdown, waits for workers to finish their
   current request before finishing.
 * USR1 - reopen all logs owned by the master and all workers
   See Unicorn::Util.reopen_logs for what is considered a log.
-* USR2 - reexecute the running binary.  A separate QUIT
+* USR2 - reexecute the running binary.  A separate TERM
   should be sent to the original process once the child is verified to
   be up and running.
 * WINCH - gracefully stops workers but keep the master running.

data/Documentation/unicorn_rails.1.txt

@@ -144,12 +144,12 @@ doing transparent upgrades.
 The following UNIX signals may be sent to the master process:
 
 * HUP - reload config file, app, and gracefully restart all workers
-* INT/TERM - quick shutdown, kills all workers immediately
-* QUIT - graceful shutdown, waits for workers to finish their
+* QUIT - quick shutdown, kills all workers immediately
+* INT/TERM - graceful shutdown, waits for workers to finish their
   current request before finishing.
 * USR1 - reopen all logs owned by the master and all workers
   See Unicorn::Util.reopen_logs for what is considered a log.
-* USR2 - reexecute the running binary.  A separate QUIT
+* USR2 - reexecute the running binary.  A separate TERM
   should be sent to the original process once the child is verified to
   be up and running.
 * WINCH - gracefully stops workers but keep the master running.

data/README

@@ -6,6 +6,14 @@ advantage of features in Unix/Unix-like kernels.  Slow clients should
 only be served by placing a reverse proxy capable of fully buffering
 both the the request and response in between \Unicorn and slow clients.
 
+== Signal handling patch
+
+This fork of Unicorn is designed to run on Heroku. Heroku and Unicorn
+disagree on signal handling, so I've swapped Unicorn's handling of
+SIGINT/SIGTERM and SIGQUIT. Now, Unicorn can shut down gracefully on
+Heroku.
+
+
 == Features
 
 * Designed for Rack, Unix, fast clients, and ease-of-debugging.  We

data/SIGNALS

@@ -13,7 +13,7 @@ Unicorn and nginx.
   If the "preload_app" directive is false (the default), then workers
   will also pick up any application code changes when restarted.  If
   "preload_app" is true, then application code changes will have no
-  effect; USR2 + QUIT (see below) must be used to load newer code in
+  effect; USR2 + TERM (see below) must be used to load newer code in
   this case.  When reloading the application, +Gem.refresh+ will
   be called so updated code for your application can pick up newly
   installed RubyGems.  It is not recommended that you uninstall
@@ -21,15 +21,15 @@ Unicorn and nginx.
   as respawned workers may enter a spawn loop when they fail to
   load an uninstalled dependency.
 
-* INT/TERM - quick shutdown, kills all workers immediately
+* QUIT - quick shutdown, kills all workers immediately
 
-* QUIT - graceful shutdown, waits for workers to finish their
+* INT/TERM - graceful shutdown, waits for workers to finish their
   current request before finishing.
 
 * USR1 - reopen all logs owned by the master and all workers
   See Unicorn::Util.reopen_logs for what is considered a log.
 
-* USR2 - reexecute the running binary.  A separate QUIT
+* USR2 - reexecute the running binary.  A separate TERM
   should be sent to the original process once the child is verified to
   be up and running.
 
@@ -46,11 +46,11 @@ Sending signals directly to the worker processes should not normally be
 needed.  If the master process is running, any exited worker will be
 automatically respawned.
 
-* INT/TERM - Quick shutdown, immediately exit.
+* QUIT - Quick shutdown, immediately exit.
   Unless WINCH has been sent to the master (or the master is killed),
   the master process will respawn a worker to replace this one.
 
-* QUIT - Gracefully exit after finishing the current request.
+* INT/TERM - Gracefully exit after finishing the current request.
   Unless WINCH has been sent to the master (or the master is killed),
   the master process will respawn a worker to replace this one.
 
@@ -107,8 +107,8 @@ The procedure is exactly like that of nginx:
 4. You should now ensure that everything is running correctly with the
    new workers as the old workers die off.
 
-5. If everything seems ok, then send QUIT to the old master.  You're done!
+5. If everything seems ok, then send TERM to the old master.  You're done!
 
    If something is broken, then send HUP to the old master to reload
-   the config and restart its workers.  Then send QUIT to the new master
+   the config and restart its workers.  Then send TERM to the new master
    process.

data/Sandbox

@@ -21,7 +21,7 @@ this:
 
         Unicorn::HttpServer::START_CTX[0] = "/some/path/to/bin/unicorn"
 
-Then use HUP to reload, and then continue with the USR2+QUIT upgrade
+Then use HUP to reload, and then continue with the USR2+TERM upgrade
 sequence.
 
 Environment variable pollution when exec-ing a new process (with USR2)

data/examples/init.sh

@@ -32,11 +32,11 @@ start)
 	$CMD
 	;;
 stop)
-	sig QUIT && exit 0
+	sig TERM && exit 0
 	echo >&2 "Not running"
 	;;
 force-stop)
-	sig TERM && exit 0
+	sig QUIT && exit 0
 	echo >&2 "Not running"
 	;;
 restart|reload)
@@ -45,7 +45,7 @@ restart|reload)
 	$CMD
 	;;
 upgrade)
-	if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+	if sig USR2 && sleep 2 && sig 0 && oldsig TERM
 	then
 		n=$TIMEOUT
 		while test -s $old_pid && test $n -ge 0

data/examples/unicorn.conf.rb

@@ -60,11 +60,11 @@ before_fork do |server, worker|
   # # phase out the old master process with SIGTTOU to avoid a
   # # thundering herd (especially in the "preload_app false" case)
   # # when doing a transparent upgrade.  The last worker spawned
-  # # will then kill off the old master process with a SIGQUIT.
+  # # will then kill off the old master process with a SIGTERM.
   # old_pid = "#{server.config[:pid]}.oldbin"
   # if old_pid != server.pid
   #   begin
-  #     sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+  #     sig = (worker.nr + 1) >= server.worker_processes ? :TERM : :TTOU
   #     Process.kill(sig, File.read(old_pid).to_i)
   #   rescue Errno::ENOENT, Errno::ESRCH
   #   end

data/lib/unicorn.rb

@@ -82,7 +82,7 @@ module Unicorn
   def self.listener_names
     Unicorn::HttpServer::LISTENERS.map do |io|
       Unicorn::SocketHelper.sock_name(io)
-    end
+    end + Unicorn::HttpServer::NEW_LISTENERS
   end
 
   def self.log_error(logger, prefix, exc)

data/lib/unicorn/http_server.rb

@@ -28,6 +28,9 @@ class Unicorn::HttpServer
   # all bound listener sockets
   LISTENERS = []
 
+  # listeners we have yet to bind
+  NEW_LISTENERS = []
+
   # This hash maps PIDs to Workers
   WORKERS = {}
 
@@ -71,7 +74,7 @@ class Unicorn::HttpServer
   #
   # To change your unicorn executable to a different path without downtime,
   # you can set the following in your Unicorn config file, HUP and then
-  # continue with the traditional USR2 + QUIT upgrade steps:
+  # continue with the traditional USR2 + TERM upgrade steps:
   #
   #   Unicorn::HttpServer::START_CTX[0] = "/home/bofh/1.9.2/bin/unicorn"
   START_CTX = {
@@ -134,6 +137,7 @@ class Unicorn::HttpServer
 
     self.master_pid = $$
     build_app! if preload_app
+    bind_new_listeners!
     spawn_missing_workers
     self
   end
@@ -271,9 +275,9 @@ class Unicorn::HttpServer
         end
         maintain_worker_count if respawn
         master_sleep(sleep_time)
-      when :QUIT # graceful shutdown
+      when :TERM, :INT # graceful shutdown
         break
-      when :TERM, :INT # immediate shutdown
+      when :QUIT # immediate shutdown
         stop(false)
         break
       when :USR1 # rotate logs
@@ -287,7 +291,7 @@ class Unicorn::HttpServer
         if Unicorn::Configurator::RACKUP[:daemonized]
           respawn = false
           logger.info "gracefully stopping all workers"
-          kill_each_worker(:QUIT)
+          kill_each_worker(:TERM)
           self.worker_processes = 0
         else
           logger.info "SIGWINCH ignored because we're not daemonized"
@@ -322,7 +326,7 @@ class Unicorn::HttpServer
     self.listeners = []
     limit = Time.now + timeout
     until WORKERS.empty? || Time.now > limit
-      kill_each_worker(graceful ? :QUIT : :TERM)
+      kill_each_worker(graceful ? :TERM : :QUIT)
       sleep(0.1)
       reap_all_workers
     end
@@ -500,7 +504,7 @@ class Unicorn::HttpServer
     (off = WORKERS.size - worker_processes) == 0 and return
     off < 0 and return spawn_missing_workers
     WORKERS.dup.each_pair { |wpid,w|
-      w.nr >= worker_processes and kill_worker(:QUIT, wpid) rescue nil
+      w.nr >= worker_processes and kill_worker(:TERM, wpid) rescue nil
     }
   end
 
@@ -554,7 +558,7 @@ class Unicorn::HttpServer
   # traps for USR1, USR2, and HUP may be set in the after_fork Proc
   # by the user.
   def init_worker_process(worker)
-    # we'll re-trap :QUIT later for graceful shutdown iff we accept clients
+    # we'll re-trap :TERM later for graceful shutdown iff we accept clients
     EXIT_SIGS.each { |sig| trap(sig) { exit!(0) } }
     exit!(0) if (SIG_QUEUE & EXIT_SIGS)[0]
     WORKER_QUEUE_SIGS.each { |sig| trap(sig, nil) }
@@ -596,7 +600,7 @@ class Unicorn::HttpServer
 
     # closing anything we IO.select on will raise EBADF
     trap(:USR1) { nr = -65536; SELF_PIPE[0].close rescue nil }
-    trap(:QUIT) { worker = nil; LISTENERS.each { |s| s.close rescue nil }.clear }
+    trap(:TERM) { worker = nil; LISTENERS.each { |s| s.close rescue nil }.clear }
     logger.info "worker=#{worker.nr} ready"
     Process.kill(:URG, ppid)
 
@@ -675,7 +679,7 @@ class Unicorn::HttpServer
     config[:listeners].replace(@init_listeners)
     config.reload
     config.commit!(self)
-    kill_each_worker(:QUIT)
+    kill_each_worker(:TERM)
     Unicorn::Util.reopen_logs
     self.app = orig_app
     build_app! if preload_app
@@ -742,7 +746,14 @@ class Unicorn::HttpServer
       @init_listeners << Unicorn::Const::DEFAULT_LISTEN
       START_CTX[:argv] << "-l#{Unicorn::Const::DEFAULT_LISTEN}"
     end
-    config_listeners.each { |addr| listen(addr) }
+    NEW_LISTENERS.replace(config_listeners)
+  end
+
+  # call only after calling inherit_listeners!
+  # This binds any listeners we did NOT inherit from the parent
+  def bind_new_listeners!
+    NEW_LISTENERS.each { |addr| listen(addr) }
     raise ArgumentError, "no listeners" if LISTENERS.empty?
+    NEW_LISTENERS.clear
   end
 end

data/t/listener_names.ru

@@ -0,0 +1,4 @@
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+names = Unicorn.listener_names.inspect # rely on preload_app=true
+run(lambda { |_| [ 200, {}, [ names ] ] })

data/t/t0004-heartbeat-timeout.sh

@@ -59,7 +59,7 @@ t_begin "SIGSTOP and SIGCONT on unicorn master does not kill worker" && {
 }
 
 t_begin "stop server" && {
-	kill -QUIT $unicorn_pid
+	kill -TERM $unicorn_pid
 }
 
 t_begin "check stderr" && check_stderr

data/t/t0008-back_out_of_upgrade.sh

@@ -70,7 +70,7 @@ t_begin "reload old master process" && {
 }
 
 t_begin "gracefully kill new master and ensure it dies" && {
-	kill -QUIT $new_master_pid
+	kill -TERM $new_master_pid
 	i=0
 	while kill -0 $new_worker_pid 2>/dev/null
 	do

data/t/t0010-reap-logging.sh

@@ -30,7 +30,7 @@ t_begin "ensure log of 1st reap is an ERROR" && {
 
 t_begin "kill 2nd worker gracefully" && {
 	pid_2=$(curl http://$listen/)
-	kill -QUIT $pid_2
+	kill -TERM $pid_2
 }
 
 t_begin "wait for 3rd worker=0 to start " && {

data/t/t0020-at_exit-handler.sh

@@ -23,8 +23,8 @@ t_begin "read worker PID" && {
 	t_info "worker_pid=$worker_pid"
 }
 
-t_begin "issue graceful shutdown (SIGQUIT) and wait for termination" && {
-	kill -QUIT $unicorn_pid
+t_begin "issue graceful shutdown (SIGTERM) and wait for termination" && {
+	kill -TERM $unicorn_pid
 
 	while kill -0 $unicorn_pid >/dev/null 2>&1
 	do

data/t/t0022-listener_names-preload_app.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+. ./test-lib.sh
+
+# Raindrops::Middleware depends on Unicorn.listener_names,
+# ensure we don't break Raindrops::Middleware when preload_app is true
+
+t_plan 4 "Unicorn.listener_names available with preload_app=true"
+
+t_begin "setup and startup" && {
+	unicorn_setup
+	echo preload_app true >> $unicorn_config
+	unicorn -E none -D listener_names.ru -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "read listener names includes listener" && {
+	resp=$(curl -sSf http://$listen/)
+	ok=false
+	t_info "resp=$resp"
+	case $resp in
+	*\"$listen\"*) ok=true ;;
+	esac
+	$ok
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "check stderr" && check_stderr
+
+t_done

data/t/t9000-preread-input.sh

@@ -42,7 +42,7 @@ t_begin "app only dispatched twice" && {
 }
 
 t_begin "killing succeeds" && {
-	kill -QUIT $unicorn_pid
+	kill -TERM $unicorn_pid
 }
 
 t_done

data/t/t9001-oob_gc.sh

@@ -38,7 +38,7 @@ t_begin "GC is started after 5 requests" && {
 }
 
 t_begin "killing succeeds" && {
-	kill -QUIT $unicorn_pid
+	kill -TERM $unicorn_pid
 }
 
 t_begin "check_stderr" && check_stderr

data/t/t9002-oob_gc-path.sh

@@ -67,7 +67,7 @@ t_begin "GC was started after 5 requests" && {
 }
 
 t_begin "killing succeeds" && {
-	kill -QUIT $unicorn_pid
+	kill -TERM $unicorn_pid
 }
 
 t_begin "check_stderr" && check_stderr

data/test/exec/test_exec.rb

@@ -21,7 +21,7 @@ unless try_require('rack')
 end
 
 class ExecTest < Test::Unit::TestCase
-  trap(:QUIT, 'IGNORE')
+  trap(:TERM, 'IGNORE')
 
   HI = <<-EOS
 use Rack::ContentLength
@@ -87,7 +87,7 @@ run lambda { |env|
     FileUtils.rmtree(@tmpdir)
     @sockets.each { |path| File.unlink(path) rescue nil }
     loop do
-      Process.kill('-QUIT', 0)
+      Process.kill('-TERM', 0)
       begin
         Process.waitpid(-1, Process::WNOHANG) or break
       rescue Errno::ECHILD
@@ -139,7 +139,7 @@ EOF
     results = hit(["http://#@addr:#@port/"])
     assert_equal other.path, results.first
 
-    Process.kill(:QUIT, pid)
+    Process.kill(:TERM, pid)
     ensure
       FileUtils.rmtree(other.path)
   end
@@ -175,7 +175,7 @@ EOF
     results = hit(["http://#@addr:#@port/"])
     assert_equal other.path, results.first
 
-    Process.kill(:QUIT, pid)
+    Process.kill(:TERM, pid)
     ensure
       FileUtils.rmtree(other.path)
   end
@@ -217,7 +217,7 @@ EOF
     assert File.exist?("#{other.path}/stdout_log_here")
     wait_master_ready("#{other.path}/stderr_log_here")
 
-    Process.kill(:QUIT, pid)
+    Process.kill(:TERM, pid)
     ensure
       FileUtils.rmtree(other.path)
   end
@@ -350,7 +350,7 @@ EOF
     wait_for_file(old_file)
     wait_for_file(pid_file)
     old_pid = File.read(old_file).to_i
-    Process.kill(:QUIT, old_pid)
+    Process.kill(:TERM, old_pid)
     wait_for_death(old_pid)
 
     ucfg.syswrite("timeout %(#{pid_file})\n") # introduce a bug
@@ -394,8 +394,8 @@ EOF
     assert_equal String, results[1].class
 
     assert_nothing_raised do
-      Process.kill(:QUIT, current_pid)
-      Process.kill(:QUIT, new_pid)
+      Process.kill(:TERM, current_pid)
+      Process.kill(:TERM, new_pid)
     end
   end
 
@@ -420,7 +420,7 @@ EOF
     wait_for_file(old_file)
     wait_for_file(pid_file)
     old_pid = File.read(old_file).to_i
-    Process.kill(:QUIT, old_pid)
+    Process.kill(:TERM, old_pid)
     wait_for_death(old_pid)
 
     File.unlink("config.ru") # break reloading
@@ -456,8 +456,8 @@ EOF
     assert_equal String, results[0].class
 
     assert_nothing_raised do
-      Process.kill(:QUIT, current_pid)
-      Process.kill(:QUIT, new_pid)
+      Process.kill(:TERM, current_pid)
+      Process.kill(:TERM, new_pid)
     end
   end
 
@@ -599,7 +599,7 @@ EOF
     end
     assert_equal 5, log.grep(/done reopening logs/).size
     assert_equal 0, log.grep(/reopening logs\.\.\./).size
-    assert_nothing_raised { Process.kill(:QUIT, pid) }
+    assert_nothing_raised { Process.kill(:TERM, pid) }
     status = nil
     assert_nothing_raised { pid, status = Process.waitpid2(pid) }
     assert status.success?, "exited successfully"
@@ -848,7 +848,7 @@ EOF
     assert_nothing_raised do
       Process.kill(:USR2, pid)
       wait_for_file("#{pid_file}.oldbin")
-      Process.kill(:QUIT, pid)
+      Process.kill(:TERM, pid)
     end
     wait_for_death(pid)
 
@@ -868,7 +868,7 @@ EOF
     assert_nothing_raised do
       Process.kill(:USR2, pid)
       wait_for_file("#{pid_file}.oldbin")
-      Process.kill(:QUIT, pid)
+      Process.kill(:TERM, pid)
     end
     wait_for_death(pid)
 
@@ -881,7 +881,7 @@ EOF
     assert $?.success?
     assert_equal expect_size, curr_fds.size, curr_fds.inspect
 
-    Process.kill(:QUIT, pid)
+    Process.kill(:TERM, pid)
     wait_for_death(pid)
   end
 
@@ -908,7 +908,7 @@ EOF
       r.close
       bodies = Hash.new(0)
       at_exit { pids.syswrite(bodies.inspect) }
-      trap(:TERM) { exit(0) }
+      trap(:QUIT) { exit(0) }
       nr = 0
       loop {
         rv = Net::HTTP.get(uri)
@@ -930,7 +930,7 @@ EOF
     assert daemon_pid > 0
     Process.kill(:HUP, daemon_pid)
     assert_equal '2', r.read(1)
-    assert_nothing_raised { Process.kill(:TERM, hitter) }
+    assert_nothing_raised { Process.kill(:QUIT, hitter) }
     _, hitter_status = Process.waitpid2(hitter)
     assert(hitter_status.success?,
            "invalid: #{hitter_status.inspect} #{File.read(pids.path)}" \
@@ -944,7 +944,7 @@ EOF
       assert x > 0
       assert pids[x] > 0
     }
-    assert_nothing_raised { Process.kill(:QUIT, daemon_pid) }
+    assert_nothing_raised { Process.kill(:TERM, daemon_pid) }
     wait_for_death(daemon_pid)
   end
 
@@ -965,7 +965,7 @@ EOF
       res2 = hit(["http://#{Unicorn::Const::DEFAULT_LISTEN}/"])
       assert_match %r{\d+}, res2.first
       assert res2.first != res.first
-      assert_nothing_raised { Process.kill(:QUIT, daemon_pid) }
+      assert_nothing_raised { Process.kill(:TERM, daemon_pid) }
       wait_for_death(daemon_pid)
     end
   end
@@ -978,7 +978,7 @@ EOF
         Process.kill(:USR2, daemon_pid)
         wait_for_file("#{pid_path}.oldbin")
         wait_for_file(pid_path)
-        Process.kill(:QUIT, daemon_pid)
+        Process.kill(:TERM, daemon_pid)
         wait_for_death(daemon_pid)
       }
       daemon_pid = File.read(pid_path).to_i
@@ -995,7 +995,7 @@ EOF
       res3 = hit(["http://#{Unicorn::Const::DEFAULT_LISTEN}/"])
       assert res2.first != res3.first
 
-      assert_nothing_raised { Process.kill(:QUIT, daemon_pid) }
+      assert_nothing_raised { Process.kill(:TERM, daemon_pid) }
       wait_for_death(daemon_pid)
     end
   end

data/test/rails/test_rails.rb

@@ -60,7 +60,7 @@ elsif RB_V[0] >= 1 && RB_V[1] >= 9
 end
 
 class RailsTest < Test::Unit::TestCase
-  trap(:QUIT, 'IGNORE')
+  trap(:TERM, 'IGNORE')
 
   COMMON_TMP = Tempfile.new('unicorn_tmp') unless defined?(COMMON_TMP)
 
@@ -267,7 +267,7 @@ logger Logger.new('#{COMMON_TMP.path}')
     return if @start_pid != $$
 
     if @pid
-      Process.kill(:QUIT, @pid)
+      Process.kill(:TERM, @pid)
       _, status = Process.waitpid2(@pid)
       assert status.success?
     end
@@ -275,7 +275,7 @@ logger Logger.new('#{COMMON_TMP.path}')
     Dir.chdir(@pwd)
     FileUtils.rmtree(@tmpdir)
     loop do
-      Process.kill('-QUIT', 0)
+      Process.kill('-TERM', 0)
       begin
         Process.waitpid(-1, Process::WNOHANG) or break
       rescue Errno::ECHILD

data/test/test_helper.rb

@@ -155,7 +155,7 @@ end
 
 def assert_shutdown(pid)
   wait_master_ready("test_stderr.#{pid}.log")
-  assert_nothing_raised { Process.kill(:QUIT, pid) }
+  assert_nothing_raised { Process.kill(:TERM, pid) }
   status = nil
   assert_nothing_raised { pid, status = Process.waitpid2(pid) }
   assert status.success?, "exited successfully"
@@ -202,12 +202,12 @@ def reexec_usr2_quit_test(pid, pid_file)
   # kill old master process
   assert_not_equal pid, new_pid
   assert_equal pid, old_pid
-  assert_nothing_raised { Process.kill(:QUIT, old_pid) }
+  assert_nothing_raised { Process.kill(:TERM, old_pid) }
   assert_nothing_raised { retry_hit(["http://#{@addr}:#{@port}/"]) }
   wait_for_death(old_pid)
   assert_equal new_pid, File.read(pid_file).to_i
   assert_nothing_raised { retry_hit(["http://#{@addr}:#{@port}/"]) }
-  assert_nothing_raised { Process.kill(:QUIT, new_pid) }
+  assert_nothing_raised { Process.kill(:TERM, new_pid) }
 end
 
 def reexec_basic_test(pid, pid_file)
@@ -230,7 +230,7 @@ def reexec_basic_test(pid, pid_file)
   new_pid = File.read(pid_file).to_i
   assert_not_equal pid, new_pid
   assert_nothing_raised { Process.kill(0, new_pid) }
-  assert_nothing_raised { Process.kill(:QUIT, new_pid) }
+  assert_nothing_raised { Process.kill(:TERM, new_pid) }
 end
 
 def wait_for_file(path)

data/test/unit/test_signals.rb

@@ -88,7 +88,7 @@ class SignalsTest < Test::Unit::TestCase
       sock.syswrite("GET / HTTP/1.0\r\n\r\n")
       buf = rd.readpartial(1)
       wait_master_ready("test_stderr.#{pid}.log")
-      Process.kill(:INT, pid)
+      Process.kill(:QUIT, pid)
       Process.waitpid(pid)
     end
     assert_equal '.', buf
@@ -125,7 +125,7 @@ class SignalsTest < Test::Unit::TestCase
     assert diff > 1.0, "diff was #{diff.inspect}"
     assert diff < 60.0
     ensure
-      Process.kill(:TERM, pid) rescue nil
+      Process.kill(:QUIT, pid) rescue nil
   end
 
   def test_response_write

metadata

@@ -2,7 +2,7 @@
 name: !binary |-
   cHJlcGxheV91bmljb3Ju
 version: !ruby/object:Gem::Version
-  version: 4.3.1.2.gc450
+  version: 4.3.1.5.ga7df
   prerelease: 8
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: !binary |-
     cmFjaw==
-  requirement: &70231804390960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,11 +23,16 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70231804390960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: !binary |-
     a2dpbw==
-  requirement: &70231804390300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -37,11 +42,18 @@ dependencies:
           Mi42
   type: :runtime
   prerelease: false
-  version_requirements: *70231804390300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          Mi42
 - !ruby/object:Gem::Dependency
   name: !binary |-
     cmFpbmRyb3Bz
-  requirement: &70231804389600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -51,11 +63,18 @@ dependencies:
           MC43
   type: :runtime
   prerelease: false
-  version_requirements: *70231804389600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MC43
 - !ruby/object:Gem::Dependency
   name: !binary |-
     aXNvbGF0ZQ==
-  requirement: &70231804388460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -65,11 +84,18 @@ dependencies:
           My4y
   type: :development
   prerelease: false
-  version_requirements: *70231804388460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          My4y
 - !ruby/object:Gem::Dependency
   name: !binary |-
     d3Jvbmdkb2M=
-  requirement: &70231804387920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - !binary |-
@@ -79,7 +105,14 @@ dependencies:
           MS42LjE=
   type: :development
   prerelease: false
-  version_requirements: *70231804387920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - !binary |-
+        fj4=
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS42LjE=
 description: ! '\Unicorn is an HTTP server for Rack applications designed to only
   serve
 
@@ -223,6 +256,7 @@ files:
 - t/detach.ru
 - t/env.ru
 - t/heartbeat-timeout.ru
+- t/listener_names.ru
 - t/my-tap-lib.sh
 - t/oob_gc.ru
 - t/oob_gc_path.ru
@@ -289,6 +323,7 @@ files:
 - t/t0019-max_header_len.sh
 - t/t0020-at_exit-handler.sh
 - t/t0021-process_detach.sh
+- t/t0022-listener_names-preload_app.sh
 - t/t0100-rack-input-tests.sh
 - t/t0116-client_body_buffer_size.sh
 - t/t0116.ru
@@ -412,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: !binary |-
   bW9uZ3JlbA==
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rack HTTP server for fast clients and Unix