unicorn 5.5.1 → 6.0.0

data/man/man1/unicorn_rails.1

@@ -1,5 +1,3 @@
-.\" Automatically generated by Pandoc 1.17.2
-.\"
 .TH "UNICORN_RAILS" "1" "September 17, 2009" "Unicorn User Manual" ""
 .hy
 .SH NAME
@@ -11,13 +9,11 @@ unicorn_rails [\-c CONFIG_FILE] [\-E RAILS_ENV] [\-D] [RACKUP_FILE]
 .SH DESCRIPTION
 .PP
 A rackup(1)\-like command to launch ancient Rails (2.x and earlier)
-applications using Unicorn.
-Rails 3 (and later) support Rack natively, so users are encouraged to
-use unicorn(1) instead of unicorn_rails(1).
+applications using Unicorn.  Rails 3 (and later) support Rack natively,
+so users are encouraged to use unicorn(1) instead of unicorn_rails(1).
 .PP
-It is expected to be started in your Rails application root
-(RAILS_ROOT), but the "working_directory" directive may be used in the
-CONFIG_FILE.
+It is expected to be started in your Rails application root (RAILS_ROOT),
+but the "working_directory" directive may be used in the CONFIG_FILE.
 .PP
 The outward interface resembles rackup(1), the internals and default
 middleware loading is designed like the \f[C]script/server\f[] command
@@ -30,56 +26,55 @@ as much as possible.
 .SH UNICORN OPTIONS
 .TP
 .B \-c, \-\-config\-file CONFIG_FILE
-Path to the Unicorn\-specific config file.
-The config file is implemented as a Ruby DSL, so Ruby code may executed.
-See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the
-full list of directives available from the DSL.
-Using an absolute path for for CONFIG_FILE is recommended as it makes
-multiple instances of Unicorn easily distinguishable when viewing ps(1)
-output.
+Path to the Unicorn\-specific config file.  The config file is
+implemented as a Ruby DSL, so Ruby code may executed.
+See the RDoc/ri for the \f[I]Unicorn::Configurator\f[] class for the full
+list of directives available from the DSL.
+Using an absolute path for for CONFIG_FILE is recommended as it
+makes multiple instances of Unicorn easily distinguishable when
+viewing ps(1) output.
 .RS
 .RE
 .TP
 .B \-D, \-\-daemonize
-Run daemonized in the background.
-The process is detached from the controlling terminal and stdin is
-redirected to "/dev/null".
+Run daemonized in the background.  The process is detached from
+the controlling terminal and stdin is redirected to "/dev/null".
 Unlike many common UNIX daemons, we do not chdir to "/" upon
-daemonization to allow more control over the startup/upgrade process.
-Unless specified in the CONFIG_FILE, stderr and stdout will also be
-redirected to "/dev/null".
+daemonization to allow more control over the startup/upgrade
+process.
+Unless specified in the CONFIG_FILE, stderr and stdout will
+also be redirected to "/dev/null".
 Daemonization will \f[I]skip\f[] loading of the
-\f[I]Rails::Rack::LogTailer\f[] middleware under Rails >= 2.3.x.
+\f[I]Rails::Rack::LogTailer\f[]
+middleware under Rails >= 2.3.x.
 By default, unicorn_rails(1) will create a PID file in
-\f[I]"RAILS_ROOT/tmp/pids/unicorn.pid"\f[].
-You may override this by specifying the "pid" directive to override this
-Unicorn config file.
+\f[I]"RAILS_ROOT/tmp/pids/unicorn.pid"\f[].  You may override this
+by specifying the "pid" directive to override this Unicorn config file.
 .RS
 .RE
 .TP
 .B \-E, \-\-env RAILS_ENV
-Run under the given RAILS_ENV.
-This sets the RAILS_ENV environment variable.
-Acceptable values are exactly those you expect in your Rails
+Run under the given RAILS_ENV.  This sets the RAILS_ENV environment
+variable.  Acceptable values are exactly those you expect in your Rails
 application, typically "development" or "production".
 .RS
 .RE
 .TP
 .B \-l, \-\-listen ADDRESS
-Listens on a given ADDRESS.
-ADDRESS may be in the form of HOST:PORT or PATH, HOST:PORT is taken to
-mean a TCP socket and PATH is meant to be a path to a UNIX domain
-socket.
+Listens on a given ADDRESS.  ADDRESS may be in the form of
+HOST:PORT or PATH, HOST:PORT is taken to mean a TCP socket
+and PATH is meant to be a path to a UNIX domain socket.
 Defaults to "0.0.0.0:8080" (all addresses on TCP port 8080).
 For production deployments, specifying the "listen" directive in
-CONFIG_FILE is recommended as it allows fine\-tuning of socket options.
+CONFIG_FILE is recommended as it allows fine\-tuning of socket
+options.
 .RS
 .RE
 .SH RACKUP COMPATIBILITY OPTIONS
 .TP
 .B \-o, \-\-host HOST
-Listen on a TCP socket belonging to HOST, default is "0.0.0.0" (all
-addresses).
+Listen on a TCP socket belonging to HOST, default is
+"0.0.0.0" (all addresses).
 If specified multiple times on the command\-line, only the
 last\-specified value takes effect.
 This option only exists for compatibility with the rackup(1) command,
@@ -89,8 +84,8 @@ use of "\-l"/"\-\-listen" switch is recommended instead.
 .TP
 .B \-p, \-\-port PORT
 Listen on the specified TCP PORT, default is 8080.
-If specified multiple times on the command\-line, only the
-last\-specified value takes effect.
+If specified multiple times on the command\-line, only the last\-specified
+value takes effect.
 This option only exists for compatibility with the rackup(1) command,
 use of "\-l"/"\-\-listen" switch is recommended instead.
 .RS
@@ -98,17 +93,16 @@ use of "\-l"/"\-\-listen" switch is recommended instead.
 .TP
 .B \-\-path PATH
 Mounts the Rails application at the given PATH (instead of "/").
-This is equivalent to setting the RAILS_RELATIVE_URL_ROOT environment
-variable.
-This is only supported under Rails 2.3 or later at the moment.
+This is equivalent to setting the RAILS_RELATIVE_URL_ROOT
+environment variable.  This is only supported under Rails 2.3
+or later at the moment.
 .RS
 .RE
 .SH RUBY OPTIONS
 .TP
 .B \-e, \-\-eval LINE
-Evaluate a LINE of Ruby code.
-This evaluation happens immediately as the command\-line is being
-parsed.
+Evaluate a LINE of Ruby code.  This evaluation happens
+immediately as the command\-line is being parsed.
 .RS
 .RE
 .TP
@@ -125,46 +119,42 @@ Turn on verbose warnings, the $VERBOSE variable is set to true.
 .RE
 .TP
 .B \-I, \-\-include PATH
-specify $LOAD_PATH.
-PATH will be prepended to $LOAD_PATH.
+specify $LOAD_PATH.  PATH will be prepended to $LOAD_PATH.
 The \[aq]:\[aq] character may be used to delimit multiple directories.
-This directive may be used more than once.
-Modifications to $LOAD_PATH take place immediately and in the order they
-were specified on the command\-line.
+This directive may be used more than once.  Modifications to
+$LOAD_PATH take place immediately and in the order they were
+specified on the command\-line.
 .RS
 .RE
 .TP
 .B \-r, \-\-require LIBRARY
-require a specified LIBRARY before executing the application.
-The "require" statement will be executed immediately and in the order
+require a specified LIBRARY before executing the application.  The
+"require" statement will be executed immediately and in the order
 they were specified on the command\-line.
 .RS
 .RE
 .SH RACKUP FILE
 .PP
-This defaults to "config.ru" in RAILS_ROOT.
-It should be the same file used by rackup(1) and other Rack launchers,
-it uses the \f[I]Rack::Builder\f[] DSL.
-Unlike many other Rack applications, RACKUP_FILE is completely
-\f[I]optional\f[] for Rails, but may be used to disable some of the
-default middleware for performance.
+This defaults to "config.ru" in RAILS_ROOT.  It should be the same
+file used by rackup(1) and other Rack launchers, it uses the
+\f[I]Rack::Builder\f[] DSL.  Unlike many other Rack applications, RACKUP_FILE
+is completely \f[I]optional\f[] for Rails, but may be used to disable
+some of the default middleware for performance.
 .PP
-Embedded command\-line options are mostly parsed for compatibility with
-rackup(1) but strongly discouraged.
+Embedded command\-line options are mostly parsed for compatibility
+with rackup(1) but strongly discouraged.
 .SH ENVIRONMENT VARIABLES
 .PP
-The RAILS_ENV variable is set by the aforementioned \-E switch.
-The RAILS_RELATIVE_URL_ROOT is set by the aforementioned \-\-path
-switch.
+The RAILS_ENV variable is set by the aforementioned \-E switch.  The
+RAILS_RELATIVE_URL_ROOT is set by the aforementioned \-\-path switch.
 Either of these variables may also be set in the shell or the Unicorn
-CONFIG_FILE.
-All application or library\-specific environment variables (e.g.
-TMPDIR, RAILS_ASSET_ID) may always be set in the Unicorn CONFIG_FILE in
-addition to the spawning shell.
-When transparently upgrading Unicorn, all environment variables set in
-the old master process are inherited by the new master process.
-Unicorn only uses (and will overwrite) the UNICORN_FD environment
-variable internally when doing transparent upgrades.
+CONFIG_FILE.  All application or library\-specific environment variables
+(e.g. TMPDIR, RAILS_ASSET_ID) may always be set in the Unicorn
+CONFIG_FILE in addition to the spawning shell.  When transparently
+upgrading Unicorn, all environment variables set in the old master
+process are inherited by the new master process.  Unicorn only uses (and
+will overwrite) the UNICORN_FD environment variable internally when
+doing transparent upgrades.
 .SH SIGNALS
 .PP
 The following UNIX signals may be sent to the master process:
@@ -176,12 +166,12 @@ INT/TERM \- quick shutdown, kills all workers immediately
 QUIT \- graceful shutdown, waits for workers to finish their current
 request before finishing.
 .IP \[bu] 2
-USR1 \- reopen all logs owned by the master and all workers See
-Unicorn::Util.reopen_logs for what is considered a log.
+USR1 \- reopen all logs owned by the master and all workers
+See Unicorn::Util.reopen_logs for what is considered a log.
 .IP \[bu] 2
-USR2 \- reexecute the running binary.
-A separate QUIT should be sent to the original process once the child is
-verified to be up and running.
+USR2 \- reexecute the running binary.  A separate QUIT
+should be sent to the original process once the child is verified to
+be up and running.
 .IP \[bu] 2
 WINCH \- gracefully stops workers but keep the master running.
 This will only work for daemonized processes.
@@ -190,7 +180,7 @@ TTIN \- increment the number of worker processes by one
 .IP \[bu] 2
 TTOU \- decrement the number of worker processes by one
 .PP
-See the SIGNALS (https://bogomips.org/unicorn/SIGNALS.html) document for
+See the SIGNALS (https://yhbt.net/unicorn/SIGNALS.html) document for
 full description of all signals used by Unicorn.
 .SH SEE ALSO
 .IP \[bu] 2
@@ -199,11 +189,19 @@ unicorn(1)
 \f[I]Rack::Builder\f[] ri/RDoc
 .IP \[bu] 2
 \f[I]Unicorn::Configurator\f[] ri/RDoc
+.UR https://yhbt.net/unicorn/Unicorn/Configurator.html
+.UE
 .IP \[bu] 2
-Unicorn RDoc (https://bogomips.org/unicorn/)
+unicorn RDoc
+.UR https://yhbt.net/unicorn/
+.UE
 .IP \[bu] 2
-Rack RDoc (https://www.rubydoc.info/github/rack/rack/)
+Rack RDoc
+.UR https://www.rubydoc.info/github/rack/rack/
+.UE
 .IP \[bu] 2
-Rackup HowTo (https://github.com/rack/rack/wiki/tutorial-rackup-howto)
+Rackup HowTo
+.UR https://github.com/rack/rack/wiki/(tutorial)-rackup-howto
+.UE
 .SH AUTHORS
-The Unicorn Community <unicorn-public@bogomips.org>.
+The Unicorn Community <unicorn-public@yhbt.net>.

data/t/GNUmakefile

@@ -1,74 +1,5 @@
-# we can run tests in parallel with GNU make
+# there used to be more, here, but we stopped relying on recursive make
 all::
+	$(MAKE) -C .. test-integration
 
-pid := $(shell echo $$PPID)
-
-RUBY = ruby
-RAKE = rake
--include ../local.mk
-ifeq ($(RUBY_VERSION),)
-  RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
-endif
-
-ifeq ($(RUBY_VERSION),)
-  $(error unable to detect RUBY_VERSION)
-endif
-
-RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
-export RUBY_ENGINE
-
-MYLIBS := $(RUBYLIB)
-
-T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
-
-all:: $(T)
-
-# can't rely on "set -o pipefail" since we don't require bash or ksh93 :<
-t_pfx = trash/$@-$(RUBY_ENGINE)-$(RUBY_VERSION)
-TEST_OPTS =
-# TRACER = strace -f -o $(t_pfx).strace -s 100000
-# TRACER = /usr/bin/time -o $(t_pfx).time
-
-ifdef V
-  ifeq ($(V),2)
-    TEST_OPTS += --trace
-  else
-    TEST_OPTS += --verbose
-  endif
-endif
-
-random_blob:
-	dd if=/dev/urandom bs=1M count=30 of=$@.$(pid)
-	mv $@.$(pid) $@
-
-$(T): random_blob
-
-dependencies := socat curl
-deps := $(addprefix .dep+,$(dependencies))
-$(deps): dep_bin = $(lastword $(subst +, ,$@))
-$(deps):
-	@which $(dep_bin) > $@.$(pid) 2>/dev/null || :
-	@test -s $@.$(pid) || \
-	  { echo >&2 "E '$(dep_bin)' not found in PATH=$(PATH)"; exit 1; }
-	@mv $@.$(pid) $@
-dep: $(deps)
-
-test_prefix := $(CURDIR)/../test/$(RUBY_ENGINE)-$(RUBY_VERSION)
-$(test_prefix)/.stamp:
-	$(MAKE) -C .. test-install
-
-$(T): export RUBY := $(RUBY)
-$(T): export RAKE := $(RAKE)
-$(T): export PATH := $(test_prefix)/bin:$(PATH)
-$(T): export RUBYLIB := $(test_prefix)/lib:$(MYLIBS)
-$(T): dep $(test_prefix)/.stamp trash/.gitignore
-	$(TRACER) $(SHELL) $(SH_TEST_OPTS) $@ $(TEST_OPTS)
-
-trash/.gitignore:
-	mkdir -p $(@D)
-	echo '*' > $@
-
-clean:
-	$(RM) -r trash/*
-
-.PHONY: $(T) clean
+.PHONY: all

data/test/benchmark/README

@@ -42,9 +42,19 @@ The benchmark client is usually httperf.
 Another gentle reminder: performance with slow networks/clients
 is NOT our problem.  That is the job of nginx (or similar).
 
+== ddstream.ru
+
+Standalone Rack app intended to show how BAD we are at slow clients.
+See usage in comments.
+
+== readinput.ru
+
+Standalone Rack app intended to show how bad we are with slow uploaders.
+See usage in comments.
+
 == Contributors
 
-This directory is maintained independently in the "benchmark" branch
-based against v0.1.0.  Only changes to this directory (test/benchmarks)
-are committed to this branch although the master branch may merge this
-branch occassionaly.
+This directory is intended to remain stable.  Do not make changes
+to benchmarking code which can change performance and invalidate
+results across revisions.  Instead, write new benchmarks and update
+coments/documentation as necessary.

data/test/benchmark/ddstream.ru

@@ -0,0 +1,50 @@
+# This app is intended to test large HTTP responses with or without
+# a fully-buffering reverse proxy such as nginx. Without a fully-buffering
+# reverse proxy, unicorn will be unresponsive when client count exceeds
+# worker_processes.
+#
+# To demonstrate how bad unicorn is at slowly reading clients:
+#
+#   # in one terminal, start unicorn with one worker:
+#   unicorn -E none -l 127.0.0.1:8080 test/benchmark/ddstream.ru
+#
+#   # in a different terminal, start more slow curl processes than
+#   # unicorn workers and watch time outputs
+#   curl --limit-rate 8K --trace-time -vsN http://127.0.0.1:8080/ >/dev/null &
+#   curl --limit-rate 8K --trace-time -vsN http://127.0.0.1:8080/ >/dev/null &
+#   wait
+#
+# The last client won't see a response until the first one is done reading
+#
+# nginx note: do not change the default "proxy_buffering" behavior.
+# Setting "proxy_buffering off" prevents nginx from protecting unicorn.
+
+# totally standalone rack app to stream a giant response
+class BigResponse
+  def initialize(bs, count)
+    @buf = "#{bs.to_s(16)}\r\n#{' ' * bs}\r\n"
+    @count = count
+    @res = [ 200,
+      { 'Transfer-Encoding' => -'chunked', 'Content-Type' => 'text/plain' },
+      self
+    ]
+  end
+
+  # rack response body iterator
+  def each
+    (1..@count).each { yield @buf }
+    yield -"0\r\n\r\n"
+  end
+
+  # rack app entry endpoint
+  def call(_env)
+    @res
+  end
+end
+
+# default to a giant (128M) response because kernel socket buffers
+# can be ridiculously large on some systems
+bs = ENV['bs'] ? ENV['bs'].to_i : 65536
+count = ENV['count'] ? ENV['count'].to_i : 2048
+warn "serving response with bs=#{bs} count=#{count} (#{bs*count} bytes)"
+run BigResponse.new(bs, count)

data/test/benchmark/readinput.ru

@@ -0,0 +1,40 @@
+# This app is intended to test large HTTP requests with or without
+# a fully-buffering reverse proxy such as nginx. Without a fully-buffering
+# reverse proxy, unicorn will be unresponsive when client count exceeds
+# worker_processes.
+
+DOC = <<DOC
+To demonstrate how bad unicorn is at slowly uploading clients:
+
+  # in one terminal, start unicorn with one worker:
+  unicorn -E none -l 127.0.0.1:8080 test/benchmark/readinput.ru
+
+  # in a different terminal, upload 45M from multiple curl processes:
+  dd if=/dev/zero bs=45M count=1 | curl -T- -HExpect: --limit-rate 1M \
+     --trace-time -v http://127.0.0.1:8080/ &
+  dd if=/dev/zero bs=45M count=1 | curl -T- -HExpect: --limit-rate 1M \
+     --trace-time -v http://127.0.0.1:8080/ &
+  wait
+
+# The last client won't see a response until the first one is done uploading
+# You also won't be able to make GET requests to view this documentation
+# while clients are uploading.  You can also view the stderr debug output
+# of unicorn (see logging code in #{__FILE__}).
+DOC
+
+run(lambda do |env|
+  input = env['rack.input']
+  buf = ''.b
+
+  # default logger contains timestamps, rely on that so users can
+  # see what the server is doing
+  l = env['rack.logger']
+
+  l.debug('BEGIN reading input ...') if l
+  :nop while input.read(16384, buf)
+  l.debug('DONE reading input ...') if l
+
+  buf.clear
+  [ 200, [ %W(Content-Length #{DOC.size}), %w(Content-Type text/plain) ],
+    [ DOC ] ]
+end)

data/test/benchmark/uconnect.perl

@@ -0,0 +1,66 @@
+#!/usr/bin/perl -w
+# Benchmark script to spawn some processes and hammer a local unicorn
+# to test accept loop performance.  This only does Unix sockets.
+# There's plenty of TCP benchmarking tools out there, and TCP port reuse
+# has predictability problems since unicorn can't do persistent connections.
+# Written in Perl for the same reason: predictability.
+# Ruby GC is not as predictable as Perl refcounting.
+use strict;
+use Socket qw(AF_UNIX SOCK_STREAM sockaddr_un);
+use POSIX qw(:sys_wait_h);
+use Getopt::Std;
+# -c / -n switches stolen from ab(1)
+my $usage = "$0 [-c CONCURRENCY] [-n NUM_REQUESTS] SOCKET_PATH\n";
+our $opt_c = 2;
+our $opt_n = 1000;
+getopts('c:n:') or die $usage;
+my $unix_path = shift or die $usage;
+use constant REQ => "GET / HTTP/1.1\r\nHost: example.com\r\n\r\n";
+use constant REQ_LEN => length(REQ);
+use constant BUFSIZ => 8192;
+$^F = 99; # don't waste syscall time with FD_CLOEXEC
+
+my %workers; # pid => worker num
+die "-n $opt_n not evenly divisible by -c $opt_c\n" if $opt_n % $opt_c;
+my $n_per_worker = $opt_n / $opt_c;
+my $addr = sockaddr_un($unix_path);
+
+for my $num (1..$opt_c) {
+	defined(my $pid = fork) or die "fork failed: $!\n";
+	if ($pid) {
+		$workers{$pid} = $num;
+	} else {
+		work($n_per_worker);
+	}
+}
+
+reap_worker(0) while scalar keys %workers;
+exit;
+
+sub work {
+	my ($n) = @_;
+	my ($buf, $x);
+	for (1..$n) {
+		socket(S, AF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+		connect(S, $addr) or die "connect: $!";
+		defined($x = syswrite(S, REQ)) or die "write: $!";
+		$x == REQ_LEN or die "short write: $x != ".REQ_LEN."\n";
+		do {
+			$x = sysread(S, $buf, BUFSIZ);
+			unless (defined $x) {
+				next if $!{EINTR};
+				die "sysread: $!\n";
+			}
+		} until ($x == 0);
+	}
+	exit 0;
+}
+
+sub reap_worker {
+	my ($flags) = @_;
+	my $pid = waitpid(-1, $flags);
+	return if !defined $pid || $pid <= 0;
+	my $p = delete $workers{$pid} || '(unknown)';
+	warn("$pid [$p] exited with $?\n") if $?;
+	$p;
+}

data/test/exec/test_exec.rb

@@ -45,8 +45,9 @@ end
 
   COMMON_TMP = Tempfile.new('unicorn_tmp') unless defined?(COMMON_TMP)
 
+  HEAVY_WORKERS = 2
   HEAVY_CFG = <<-EOS
-worker_processes 4
+worker_processes #{HEAVY_WORKERS}
 timeout 30
 logger Logger.new('#{COMMON_TMP.path}')
 before_fork do |server, worker|
@@ -573,7 +574,7 @@ EOF
     assert_equal String, results[0].class
     worker_pid = results[0].to_i
     assert_not_equal pid, worker_pid
-    s = UNIXSocket.new(tmp.path)
+    s = unix_socket(tmp.path)
     s.syswrite("GET / HTTP/1.0\r\n\r\n")
     results = ''
     loop { results << s.sysread(4096) } rescue nil
@@ -606,6 +607,7 @@ EOF
   def test_weird_config_settings
     File.open("config.ru", "wb") { |fp| fp.syswrite(HI) }
     ucfg = Tempfile.new('unicorn_test_config')
+    proc_total = HEAVY_WORKERS + 1 # + 1 for master
     ucfg.syswrite(HEAVY_CFG)
     pid = xfork do
       redirect_test_io do
@@ -616,9 +618,9 @@ EOF
     results = retry_hit(["http://#{@addr}:#{@port}/"])
     assert_equal String, results[0].class
     wait_master_ready(COMMON_TMP.path)
-    wait_workers_ready(COMMON_TMP.path, 4)
+    wait_workers_ready(COMMON_TMP.path, HEAVY_WORKERS)
     bf = File.readlines(COMMON_TMP.path).grep(/\bbefore_fork: worker=/)
-    assert_equal 4, bf.size
+    assert_equal HEAVY_WORKERS, bf.size
     rotate = Tempfile.new('unicorn_rotate')
 
     File.rename(COMMON_TMP.path, rotate.path)
@@ -630,20 +632,20 @@ EOF
     tries = DEFAULT_TRIES
     log = File.readlines(rotate.path)
     while (tries -= 1) > 0 &&
-          log.grep(/reopening logs\.\.\./).size < 5
+          log.grep(/reopening logs\.\.\./).size < proc_total
       sleep DEFAULT_RES
       log = File.readlines(rotate.path)
     end
-    assert_equal 5, log.grep(/reopening logs\.\.\./).size
+    assert_equal proc_total, log.grep(/reopening logs\.\.\./).size
     assert_equal 0, log.grep(/done reopening logs/).size
 
     tries = DEFAULT_TRIES
     log = File.readlines(COMMON_TMP.path)
-    while (tries -= 1) > 0 && log.grep(/done reopening logs/).size < 5
+    while (tries -= 1) > 0 && log.grep(/done reopening logs/).size < proc_total
       sleep DEFAULT_RES
       log = File.readlines(COMMON_TMP.path)
     end
-    assert_equal 5, log.grep(/done reopening logs/).size
+    assert_equal proc_total, log.grep(/done reopening logs/).size
     assert_equal 0, log.grep(/reopening logs\.\.\./).size
 
     Process.kill(:QUIT, pid)
@@ -730,7 +732,7 @@ EOF
     wait_for_file(sock_path)
     assert File.socket?(sock_path)
 
-    sock = UNIXSocket.new(sock_path)
+    sock = unix_socket(sock_path)
     sock.syswrite("GET / HTTP/1.0\r\n\r\n")
     results = sock.sysread(4096)
 
@@ -740,7 +742,7 @@ EOF
     wait_for_file(sock_path)
     assert File.socket?(sock_path)
 
-    sock = UNIXSocket.new(sock_path)
+    sock = unix_socket(sock_path)
     sock.syswrite("GET / HTTP/1.0\r\n\r\n")
     results = sock.sysread(4096)
 
@@ -775,7 +777,7 @@ EOF
     assert_equal pid, File.read(pid_file).to_i
     assert File.socket?(sock_path), "socket created"
 
-    sock = UNIXSocket.new(sock_path)
+    sock = unix_socket(sock_path)
     sock.syswrite("GET / HTTP/1.0\r\n\r\n")
     results = sock.sysread(4096)
 
@@ -801,7 +803,7 @@ EOF
     wait_for_file(new_sock_path)
     assert File.socket?(new_sock_path), "socket exists"
     @sockets.each do |path|
-      sock = UNIXSocket.new(path)
+      sock = unix_socket(path)
       sock.syswrite("GET / HTTP/1.0\r\n\r\n")
       results = sock.sysread(4096)
       assert_equal String, results.class