unicorn 0.991.0.4.g0cb0 → 1.0.0

data/CONTRIBUTORS

@@ -1,8 +1,11 @@
-Unicorn developers:
-* Eric Wong
+Unicorn developers (let us know if we forgot you):
+* Eric Wong (BDFL, BOFH)
 * Suraj N. Kurapati
 * Andrey Stikheev
 * Wayne Larsen
+* Iñaki Baz Castillo
+* Augusto Becciu
+* Hongli Lai
 * ... (help wanted)
 
 We would like to thank following folks for helping make Unicorn possible:

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.991.0.GIT
+DEF_VER=v1.0.0.GIT
 
 LF='
 '

data/GNUmakefile

@@ -8,6 +8,7 @@ MRI = ruby
 RUBY = ruby
 RAKE = rake
 RAGEL = ragel
+RSYNC = rsync
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN
@@ -168,7 +169,7 @@ NEWS: GIT-VERSION-FILE .manifest
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE = 0.990.0
+SINCE = 0.991.0
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)
@@ -221,7 +222,7 @@ publish_doc:
 	$(MAKE) doc_gz
 	tar cf - $$(git ls-files examples/) | (cd doc && tar xf -)
 	chmod 644 $$(find doc -type f)
-	rsync -av doc/ unicorn.bogomips.org:/srv/unicorn/
+	$(RSYNC) -av doc/ unicorn.bogomips.org:/srv/unicorn/
 	git ls-files | xargs touch
 
 # Create gzip variants of the same timestamp as the original so nginx

data/lib/unicorn/app/exec_cgi.rb

@@ -120,7 +120,8 @@ module Unicorn::App
     # ensures rack.input is a file handle that we can redirect stdin to
     def force_file_input(env)
       inp = env['rack.input']
-      if inp.size == 0 # inp could be a StringIO or StringIO-like object
+      # inp could be a StringIO or StringIO-like object
+      if inp.respond_to?(:size) && inp.size == 0
         ::File.open('/dev/null', 'rb')
       else
         tmp = Unicorn::Util.tmpio

data/lib/unicorn/const.rb

@@ -8,8 +8,8 @@ module Unicorn
   # Symbols did not really improve things much compared to constants.
   module Const
 
-    # The current version of Unicorn, currently 0.991.0
-    UNICORN_VERSION="0.991.0"
+    # The current version of Unicorn, currently 1.0.0
+    UNICORN_VERSION="1.0.0"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port

data/lib/unicorn/tee_input.rb

@@ -39,6 +39,12 @@ module Unicorn
     # For Transfer-Encoding:chunked requests, this requires consuming
     # all of the input stream before returning since there's no other
     # way to determine the size of the request body beforehand.
+    #
+    # This method is no longer part of the Rack specification as of
+    # Rack 1.2, so its use is not recommended.  This method only exists
+    # for compatibility with Rack applications designed for Rack 1.1 and
+    # earlier.  Most applications should only need to call +read+ with a
+    # specified +length+ in a loop until it returns +nil+.
     def size
       len and return len
 

data/lib/unicorn/util.rb

@@ -22,7 +22,6 @@ module Unicorn
 
         ! fp.closed? &&
           fp.sync &&
-          fp.path &&
           fp.path[0] == ?/ &&
           (fp.fcntl(Fcntl::F_GETFL) & append_flags) == append_flags
       end

data/local.mk.sample

@@ -9,10 +9,18 @@ DLEXT := so
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.
 prefix = $(HOME)
+
+# XXX clean this up
 ifeq ($(r192),)
   ifeq ($(r19),)
     ifeq ($(rbx),)
-      RUBY := $(prefix)/bin/ruby
+      ifeq ($(r186),)
+        RUBY := $(prefix)/bin/ruby
+      else
+        prefix := $(prefix)/r186-p114
+        export PATH := $(prefix)/bin:$(PATH)
+        RUBY := $(prefix)/bin/ruby
+      endif
     else
       prefix := $(prefix)/rbx
       export PATH := $(prefix)/bin:$(PATH)
@@ -42,7 +50,7 @@ endif
 # SHELL := /bin/bash -e -o pipefail
 SHELL := /bin/ksh93 -e -o pipefail
 
-full-test: test-18 test-191 test-192 test-rbx
+full-test: test-18 test-191 test-192 test-rbx test-186
 
 # FIXME: keep eye on Rubinius activity and wait for fixes from upstream
 # so we don't need RBX_SKIP anymore
@@ -50,6 +58,8 @@ test-rbx: export RBX_SKIP := 1
 test-rbx: export RUBY := $(RUBY)
 test-rbx:
 	$(MAKE) test test-integration rbx=T 2>&1 |sed -e 's!^!rbx !'
+test-186:
+	$(MAKE) test-all r186=1 2>&1 |sed 's!^!1.8.6 !'
 test-18:
 	$(MAKE) test-all 2>&1 |sed 's!^!1.8 !'
 test-191:

data/t/t0006-reopen-logs.sh

@@ -0,0 +1,83 @@
+#!/bin/sh
+. ./test-lib.sh
+
+t_plan 15 "reopen rotated logs"
+
+t_begin "setup and startup" && {
+	rtmpfiles curl_out curl_err r_rot
+	unicorn_setup
+	unicorn -D t0006.ru -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "ensure server is responsive" && {
+	test xtrue = x$(curl -sSf http://$listen/ 2> $curl_err)
+}
+
+t_begin "ensure stderr log is clean" && check_stderr
+
+t_begin "external log rotation" && {
+	rm -f $r_rot
+	mv $r_err $r_rot
+}
+
+t_begin "send reopen log signal (USR1)" && {
+	kill -USR1 $unicorn_pid
+}
+
+t_begin "wait for rotated log to reappear" && {
+	nr=60
+	while ! test -f $r_err && test $nr -ge 0
+	do
+		sleep 1
+		nr=$(( $nr - 1 ))
+	done
+}
+
+t_begin "ensure server is still responsive" && {
+	test xtrue = x$(curl -sSf http://$listen/ 2> $curl_err)
+}
+
+t_begin "wait for worker to reopen logs" && {
+	nr=60
+	re="worker=.* done reopening logs"
+	while ! grep "$re" < $r_err >/dev/null && test $nr -ge 0
+	do
+		sleep 1
+		nr=$(( $nr - 1 ))
+	done
+}
+
+dbgcat r_rot
+dbgcat r_err
+
+t_begin "ensure no errors from curl" && {
+	test ! -s $curl_err
+}
+
+t_begin "current server stderr is clean" && check_stderr
+
+t_begin "rotated stderr is clean" && {
+	check_stderr $r_rot
+}
+
+t_begin "server is now writing logs to new stderr" && {
+	before_rot=$(wc -c < $r_rot)
+	before_err=$(wc -c < $r_err)
+	test xtrue = x$(curl -sSf http://$listen/ 2> $curl_err)
+	after_rot=$(wc -c < $r_rot)
+	after_err=$(wc -c < $r_err)
+	test $after_rot -eq $before_rot
+	test $after_err -gt $before_err
+}
+
+t_begin "stop server" && {
+	kill $unicorn_pid
+}
+
+dbgcat r_err
+
+t_begin "current server stderr is clean" && check_stderr
+t_begin "rotated stderr is clean" && check_stderr $r_rot
+
+t_done

data/t/t0006.ru

@@ -0,0 +1,13 @@
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+run lambda { |env|
+
+  # our File objects for stderr/stdout should always have #path
+  # and be sync=true
+  ok = $stderr.sync &&
+       $stdout.sync &&
+       String === $stderr.path &&
+       String === $stdout.path
+
+  [ 200, {}, [ "#{ok}\n" ] ]
+}

data/t/t0007-working_directory_no_embed_cli.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+. ./test-lib.sh
+
+t_plan 4 "config.ru inside alt working_directory (no embedded switches)"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rm -rf $t_pfx.app
+	mkdir $t_pfx.app
+
+	cat > $t_pfx.app/config.ru <<EOF
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+run lambda { |env| [ 200, {}, [ "#{\$master_ppid}\\n" ] ] }
+EOF
+	# the whole point of this exercise
+	echo "working_directory '$t_pfx.app'" >> $unicorn_config
+
+	# allows ppid to be 1 in before_fork
+	echo "preload_app true" >> $unicorn_config
+	cat >> $unicorn_config <<\EOF
+before_fork do |server,worker|
+  $master_ppid = Process.ppid # should be zero to detect daemonization
+end
+EOF
+
+	cd /
+	unicorn -D -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "hit with curl" && {
+	body=$(curl -sSf http://$listen/)
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "response body ppid == 1 (daemonized)" && {
+	test "$body" -eq 1
+}
+
+t_done

data/t/t0303-rails3-alt-working_directory_config.ru.sh

@@ -10,8 +10,11 @@ t_plan 5 "Rails 3 (beta) inside alt working_directory (w/ config.ru)"
 
 t_begin "setup and start" && {
 	unicorn_setup
-	rtmpfiles unicorn_config_tmp usock
-	rm -f $usock
+	rtmpfiles unicorn_config_tmp usocket
+	if test -e $usocket
+	then
+		die "unexpected $usocket"
+	fi
 	rails3_app=$(cd rails3-app && pwd)
 	rm -rf $t_pfx.app
 	mkdir $t_pfx.app
@@ -22,7 +25,7 @@ t_begin "setup and start" && {
 	unicorn_setup
 	rm $pid
 
-	echo "#\\--daemonize --host $host --port $port -l $usock" \
+	echo "#\\--daemonize --host $host --port $port -l $usocket" \
 	     >> $t_pfx.app/config.ru
 
 	# we have --host/--port in config.ru instead
@@ -48,7 +51,7 @@ t_begin "static file serving works" && {
 }
 
 t_begin "socket created" && {
-	test -S $usock
+	test -S $usocket
 }
 
 t_begin "killing succeeds" && {

data/t/t0304-rails3-alt-working_directory_no_embed_cli.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+. ./test-rails3.sh
+
+t_plan 5 "Rails 3 (beta) inside alt working_directory (no embedded switches)"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rtmpfiles unicorn_config_tmp usocket
+	if test -e $usocket
+	then
+		die "unexpected $usocket"
+	fi
+	rails3_app=$(cd rails3-app && pwd)
+	rm -rf $t_pfx.app
+	mkdir $t_pfx.app
+	cd $t_pfx.app
+	( cd $rails3_app && tar cf - . ) | tar xf -
+	$RAKE db:sessions:create
+	$RAKE db:migrate
+	unicorn_setup
+	rm $pid
+
+	grep -v ^pid $unicorn_config > $unicorn_config_tmp
+	echo "working_directory '$t_pfx.app'" >> $unicorn_config_tmp
+	cd /
+	unicorn_rails -c $unicorn_config_tmp \
+	  --daemonize --host $host --port $port -l $usocket
+}
+
+t_begin "pids in the right place" && {
+	if test -e $pid
+	then
+		die "pid=$pid not expected"
+	fi
+
+	unicorn_rails_pid="$t_pfx.app/tmp/pids/unicorn.pid"
+	unicorn_pid=$(cat $unicorn_rails_pid)
+}
+
+t_begin "static file serving works" && {
+	test x"$(curl -sSf http://$listen/x.txt)" = xHELLO
+}
+
+t_begin "socket created" && {
+	test -S $usocket
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_done

data/test/exec/test_exec.rb

@@ -20,10 +20,6 @@ unless try_require('rack')
   do_test = false
 end
 
-if ENV['RBX_SKIP']
-  do_test = false
-end
-
 class ExecTest < Test::Unit::TestCase
   trap(:QUIT, 'IGNORE')
 
@@ -613,7 +609,7 @@ EOF
     results = retry_hit(["http://#{@addr}:#{@port}/"])
     assert_equal String, results[0].class
     assert_shutdown(pid)
-  end
+  end unless ENV['RBX_SKIP']
 
   def test_config_ru_alt_path
     config_path = "#{@tmpdir}/foo.ru"

data/test/unit/test_signals.rb

@@ -201,6 +201,6 @@ class SignalsTest < Test::Unit::TestCase
     assert size_before < @tmp.stat.size
     assert_equal pid, sock.sysread(4096)[/\r\nX-Pid: (\d+)\r\n/, 1].to_i
     sock.close
-  end unless ENV['RBX_SKIP']
+  end
 
 end

data/test/unit/test_socket_helper.rb

@@ -97,7 +97,7 @@ class TestSocketHelper < Test::Unit::TestCase
     a = bind_listen(tcp_server)
     assert_equal a.fileno, tcp_server.fileno
     assert_equal a.fileno, @tcp_listener.fileno
-  end unless ENV["RBX_SKIP"]
+  end
 
   def test_bind_listen_unix_rebind
     test_bind_listen_unix
@@ -139,11 +139,11 @@ class TestSocketHelper < Test::Unit::TestCase
     assert_equal @tcp_listener.fileno, @tcp_server.fileno
     assert TCPServer === @tcp_server
     assert_equal @tcp_listener_name, sock_name(@tcp_server)
-  end unless ENV["RBX_SKIP"]
+  end
 
   def test_sock_name
     test_server_cast
     sock_name(@unix_server)
-  end unless ENV["RBX_SKIP"]
+  end
 
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 1081584981
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
+  - 1
   - 0
-  - 991
   - 0
-  - 4
-  - g0cb0
-  version: 0.991.0.4.g0cb0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 +00:00
+date: 2010-06-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -208,10 +206,14 @@ files:
 - t/t0003-working_directory.sh
 - t/t0004-working_directory_broken.sh
 - t/t0005-working_directory_app.rb.sh
+- t/t0006-reopen-logs.sh
+- t/t0006.ru
+- t/t0007-working_directory_no_embed_cli.sh
 - t/t0300-rails3-basic.sh
 - t/t0301-rails3-missing-config-ru.sh
 - t/t0302-rails3-alt-working_directory.sh
 - t/t0303-rails3-alt-working_directory_config.ru.sh
+- t/t0304-rails3-alt-working_directory_no_embed_cli.sh
 - t/test-lib.sh
 - t/test-rails3.sh
 - test/aggregate.rb
@@ -333,14 +335,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: mongrel