unicorn 1.0.2 → 1.1.0

data/test/test_helper.rb

@@ -32,7 +32,6 @@ require 'tempfile'
 require 'fileutils'
 require 'logger'
 require 'unicorn'
-require 'unicorn_http'
 
 if ENV['DEBUG']
   require 'ruby-debug'

data/test/unit/test_socket_helper.rb

@@ -146,4 +146,28 @@ class TestSocketHelper < Test::Unit::TestCase
     sock_name(@unix_server)
   end
 
+  def test_tcp_defer_accept_default
+    port = unused_port @test_addr
+    name = "#@test_addr:#{port}"
+    sock = bind_listen(name)
+    cur = sock.getsockopt(Socket::SOL_TCP, TCP_DEFER_ACCEPT).unpack('i')[0]
+    assert cur >= 1
+  end if defined?(TCP_DEFER_ACCEPT)
+
+  def test_tcp_defer_accept_disable
+    port = unused_port @test_addr
+    name = "#@test_addr:#{port}"
+    sock = bind_listen(name, :tcp_defer_accept => false)
+    cur = sock.getsockopt(Socket::SOL_TCP, TCP_DEFER_ACCEPT).unpack('i')[0]
+    assert_equal 0, cur
+  end if defined?(TCP_DEFER_ACCEPT)
+
+  def test_tcp_defer_accept_nr
+    port = unused_port @test_addr
+    name = "#@test_addr:#{port}"
+    sock = bind_listen(name, :tcp_defer_accept => 60)
+    cur = sock.getsockopt(Socket::SOL_TCP, TCP_DEFER_ACCEPT).unpack('i')[0]
+    assert cur > 1
+  end if defined?(TCP_DEFER_ACCEPT)
+
 end

data/unicorn.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://unicorn.bogomips.org/}
 
   summary = %q{Rack HTTP server for fast clients and Unix}
-  s.rdoc_options = [ "-t", "Unicorn: #{summary}" ]
+  s.rdoc_options = [ "-Na", "-t", "Unicorn: #{summary}" ]
   s.require_paths = %w(lib ext)
   s.rubyforge_project = %q{mongrel}
   s.summary = summary
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   # *strongly* recommended for security reasons.
   s.add_dependency(%q<rack>)
 
-  s.add_development_dependency('isolate', '~> 3.0.0')
+  s.add_development_dependency('isolate', '~> 2.0.2')
 
   # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older RubyGems
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +00:00
+date: 2010-07-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
-        - 3
-        - 0
+        - 2
         - 0
-        version: 3.0.0
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id002
 description: |-
@@ -169,7 +169,6 @@ files:
 - t/bin/utee
 - t/env.ru
 - t/my-tap-lib.sh
-- t/pid.ru
 - t/rails3-app/.gitignore
 - t/rails3-app/Gemfile
 - t/rails3-app/Rakefile
@@ -210,9 +209,6 @@ files:
 - t/t0006-reopen-logs.sh
 - t/t0006.ru
 - t/t0007-working_directory_no_embed_cli.sh
-- t/t0008-back_out_of_upgrade.sh
-- t/t0009-winch_ttin.sh
-- t/t0012-reload-empty-config.sh
 - t/t0300-rails3-basic.sh
 - t/t0301-rails3-missing-config-ru.sh
 - t/t0302-rails3-alt-working_directory.sh
@@ -321,6 +317,7 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
+- -Na
 - -t
 - "Unicorn: Rack HTTP server for fast clients and Unix"
 require_paths: 

data/t/pid.ru

@@ -1,3 +0,0 @@
-use Rack::ContentLength
-use Rack::ContentType, "text/plain"
-run lambda { |env| [ 200, {}, [ "#$$\n" ] ] }

data/t/t0008-back_out_of_upgrade.sh

@@ -1,110 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-t_plan 13 "backout of USR2 upgrade"
-
-worker_wait_start () {
-	test xSTART = x"$(cat $fifo)"
-	unicorn_pid=$(cat $pid)
-}
-
-t_begin "setup and start" && {
-	unicorn_setup
-	rm -f $pid.oldbin
-
-cat >> $unicorn_config <<EOF
-after_fork do |server, worker|
-  # test script will block while reading from $fifo,
-  # so notify the script on the first worker we spawn
-  # by opening the FIFO
-  if worker.nr == 0
-    File.open("$fifo", "wb") { |fp| fp.syswrite "START" }
-  end
-end
-EOF
-	unicorn -D -c $unicorn_config pid.ru
-	worker_wait_start
-	orig_master_pid=$unicorn_pid
-}
-
-t_begin "read original worker pid" && {
-	orig_worker_pid=$(curl -sSf http://$listen/)
-	test -n "$orig_worker_pid" && kill -0 $orig_worker_pid
-}
-
-t_begin "upgrade to new master" && {
-	kill -USR2 $orig_master_pid
-}
-
-t_begin "kill old worker" && {
-	kill -WINCH $orig_master_pid
-}
-
-t_begin "wait for new worker to start" && {
-	worker_wait_start
-	test $unicorn_pid -ne $orig_master_pid
-	new_master_pid=$unicorn_pid
-}
-
-t_begin "old master pid is stashed in $pid.oldbin" && {
-	test -s "$pid.oldbin"
-	test $orig_master_pid -eq $(cat $pid.oldbin)
-}
-
-t_begin "ensure old worker is no longer running" && {
-	i=0
-	while kill -0 $orig_worker_pid 2>/dev/null
-	do
-		i=$(( $i + 1 ))
-		test $i -lt 600 || die "timed out"
-		sleep 1
-	done
-}
-
-t_begin "capture pid of new worker" && {
-	new_worker_pid=$(curl -sSf http://$listen/)
-}
-
-t_begin "reload old master process" && {
-	kill -HUP $orig_master_pid
-	worker_wait_start
-}
-
-t_begin "gracefully kill new master and ensure it dies" && {
-	kill -QUIT $new_master_pid
-	i=0
-	while kill -0 $new_worker_pid 2>/dev/null
-	do
-		i=$(( $i + 1 ))
-		test $i -lt 600 || die "timed out"
-		sleep 1
-	done
-}
-
-t_begin "ensure $pid.oldbin does not exist" && {
-	i=0
-	while test -s $pid.oldbin
-	do
-		i=$(( $i + 1 ))
-		test $i -lt 600 || die "timed out"
-		sleep 1
-	done
-	while ! test -s $pid
-	do
-		i=$(( $i + 1 ))
-		test $i -lt 600 || die "timed out"
-		sleep 1
-	done
-}
-
-t_begin "ensure $pid is correct" && {
-	cur_master_pid=$(cat $pid)
-	test $orig_master_pid -eq $cur_master_pid
-}
-
-t_begin "killing succeeds" && {
-	kill $orig_master_pid
-}
-
-dbgcat r_err
-
-t_done

data/t/t0009-winch_ttin.sh

@@ -1,59 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-t_plan 8 "SIGTTIN succeeds after SIGWINCH"
-
-t_begin "setup and start" && {
-	unicorn_setup
-cat >> $unicorn_config <<EOF
-after_fork do |server, worker|
-  # test script will block while reading from $fifo,
-  File.open("$fifo", "wb") { |fp| fp.syswrite worker.nr.to_s }
-end
-EOF
-	unicorn -D -c $unicorn_config pid.ru
-	unicorn_wait_start
-	test 0 -eq $(cat $fifo) || die "worker.nr != 0"
-}
-
-t_begin "read worker pid" && {
-	orig_worker_pid=$(curl -sSf http://$listen/)
-	test -n "$orig_worker_pid" && kill -0 $orig_worker_pid
-}
-
-t_begin "stop all workers" && {
-	kill -WINCH $unicorn_pid
-}
-
-# we have to do this next step before delivering TTIN
-# signals aren't guaranteed to delivered in order
-t_begin "wait for worker to die" && {
-	i=0
-	while kill -0 $orig_worker_pid 2>/dev/null
-	do
-		i=$(( $i + 1 ))
-		test $i -lt 600 || die "timed out"
-		sleep 1
-	done
-}
-
-t_begin "start one worker back up" && {
-	kill -TTIN $unicorn_pid
-}
-
-t_begin "wait for new worker to start" && {
-	test 0 -eq $(cat $fifo) || die "worker.nr != 0"
-	new_worker_pid=$(curl -sSf http://$listen/)
-	test -n "$new_worker_pid" && kill -0 $new_worker_pid
-	test $orig_worker_pid -ne $new_worker_pid || \
-	   die "worker wasn't replaced"
-}
-
-t_begin "killing succeeds" && {
-	kill $unicorn_pid
-}
-
-t_begin "check stderr" && check_stderr
-
-dbgcat r_err
-
-t_done

data/t/t0012-reload-empty-config.sh

@@ -1,82 +0,0 @@
-#!/bin/sh
-. ./test-lib.sh
-t_plan 9 "reloading unset config resets defaults"
-
-t_begin "setup and start" && {
-	unicorn_setup
-	rtmpfiles unicorn_config_orig before_reload after_reload
-	cat $unicorn_config > $unicorn_config_orig
-	cat >> $unicorn_config <<EOF
-logger Logger.new(STDOUT)
-preload_app true
-timeout 0x7fffffff
-worker_processes 2
-after_fork { |s,w| }
-\$dump_cfg = lambda { |fp,srv|
-  defaults = Unicorn::Configurator::DEFAULTS
-  defaults.keys.map { |x| x.to_s }.sort.each do |key|
-    next if key =~ %r{\Astd(?:err|out)_path\z}
-    key = key.to_sym
-    def_value = defaults[key]
-    srv_value = srv.__send__(key)
-    fp << "#{key}|#{srv_value}|#{def_value}\\n"
-  end
-}
-before_fork { |s,w|
-  File.open("$before_reload", "a") { |fp| \$dump_cfg.call(fp, s) }
-}
-before_exec { |s| }
-EOF
-	unicorn -D -c $unicorn_config env.ru
-	unicorn_wait_start
-}
-
-t_begin "ensure worker is started" && {
-	curl -sSf http://$listen/ > $tmp
-}
-
-t_begin "replace config file with original(-ish)" && {
-	grep -v ^pid < $unicorn_config_orig > $unicorn_config
-	cat >> $unicorn_config <<EOF
-before_fork { |s,w|
-  File.open("$after_reload", "a") { |fp| \$dump_cfg.call(fp, s) }
-}
-EOF
-}
-
-t_begin "reload signal succeeds" && {
-	kill -HUP $unicorn_pid
-	while ! egrep '(done|error) reloading' $r_err >/dev/null
-	do
-		sleep 1
-	done
-
-	grep 'done reloading' $r_err >/dev/null
-}
-
-t_begin "ensure worker is started" && {
-	curl -sSf http://$listen/ > $tmp
-}
-
-t_begin "pid file no longer exists" && {
-	if test -f $pid
-	then
-		die "pid=$pid should not exist"
-	fi
-}
-
-t_begin "killing succeeds" && {
-	kill $unicorn_pid
-}
-
-t_begin "check stderr" && {
-	check_stderr
-}
-
-t_begin "ensure reloading restored settings" && {
-	awk < $after_reload -F'|' '
-$1 != "before_fork" && $2 != $3 { print $0; exit(1) }
-'
-}
-
-t_done