unicorn 1.1.2 → 1.1.3

data/GIT-VERSION-GEN

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

data/Rakefile

@@ -207,7 +207,7 @@ task :isolate do
   status.success? or abort status.inspect
 
   # pure Ruby gems can be shared across all Rubies
-  %w(3.0.0.beta4).each do |rails_ver|
+  %w(3.0.0.rc2).each do |rails_ver|
     opts[:path] = "tmp/isolate/rails-#{rails_ver}"
     pid = fork { Isolate.now!(opts) { gem 'rails', rails_ver } }
     _, status = Process.waitpid2(pid)

data/bin/unicorn

@@ -10,8 +10,9 @@ host, port = Unicorn::Const::DEFAULT_HOST, Unicorn::Const::DEFAULT_PORT
 set_listener = false
 
 opts = OptionParser.new("", 24, '  ') do |opts|
-  opts.banner = "Usage: #{File.basename($0)} " \
-                "[ruby options] [unicorn options] [rackup config file]"
+  cmd = File.basename($0)
+  opts.banner = "Usage: #{cmd} " \
+                "[ruby options] [#{cmd} options] [rackup config file]"
 
   opts.separator "Ruby options:"
 
@@ -39,7 +40,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
     require library
   end
 
-  opts.separator "Unicorn options:"
+  opts.separator "#{cmd} options:"
 
   # some of these switches exist for rackup command-line compatibility,
 
@@ -100,7 +101,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on_tail("-v", "--version", "Show version") do
-    puts "unicorn v#{Unicorn::Const::UNICORN_VERSION}"
+    puts "#{cmd} v#{Unicorn::Const::UNICORN_VERSION}"
     exit
   end
 

data/bin/unicorn_rails

@@ -100,7 +100,7 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on_tail("-v", "--version", "Show version") do
-    puts " v#{Unicorn::Const::UNICORN_VERSION}"
+    puts "#{cmd} v#{Unicorn::Const::UNICORN_VERSION}"
     exit
   end
 

data/lib/unicorn.rb

@@ -423,10 +423,12 @@ module Unicorn
               respawn = false
               logger.info "gracefully stopping all workers"
               kill_each_worker(:QUIT)
+              self.worker_processes = 0
             else
               logger.info "SIGWINCH ignored because we're not daemonized"
             end
           when :TTIN
+            respawn = true
             self.worker_processes += 1
           when :TTOU
             self.worker_processes -= 1 if self.worker_processes > 0

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 1.1.2
-    UNICORN_VERSION="1.1.2"
+    # The current version of Unicorn, currently 1.1.3
+    UNICORN_VERSION="1.1.3"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port

data/lib/unicorn/util.rb

@@ -24,6 +24,8 @@ module Unicorn
           fp.sync &&
           fp.path[0] == ?/ &&
           (fp.fcntl(Fcntl::F_GETFL) & append_flags) == append_flags
+        rescue IOError, Errno::EBADF
+          false
       end
 
       def chown_logs(uid, gid)
@@ -46,20 +48,32 @@ module Unicorn
         ObjectSpace.each_object(File) { |fp| is_log?(fp) and to_reopen << fp }
 
         to_reopen.each do |fp|
-          orig_st = fp.stat
+          orig_st = begin
+            fp.stat
+          rescue IOError, Errno::EBADF
+            next
+          end
+
           begin
             b = File.stat(fp.path)
             next if orig_st.ino == b.ino && orig_st.dev == b.dev
           rescue Errno::ENOENT
           end
 
-          File.open(fp.path, 'a') { |tmpfp| fp.reopen(tmpfp) }
-          fp.sync = true
-          new_st = fp.stat
-          if orig_st.uid != new_st.uid || orig_st.gid != new_st.gid
-            fp.chown(orig_st.uid, orig_st.gid)
+          begin
+            File.open(fp.path, 'a') { |tmpfp| fp.reopen(tmpfp) }
+            fp.sync = true
+            new_st = fp.stat
+
+            # this should only happen in the master:
+            if orig_st.uid != new_st.uid || orig_st.gid != new_st.gid
+              fp.chown(orig_st.uid, orig_st.gid)
+            end
+
+            nr += 1
+          rescue IOError, Errno::EBADF
+            # not much we can do...
           end
-          nr += 1
         end
 
         nr

data/t/rails3-app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-# gem 'rails', '3.0.0.beta3'
+# gem 'rails', '3.0.0.rc2'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

data/t/t0009-winch_ttin.sh

@@ -0,0 +1,59 @@
+#!/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/test-rails3.sh

@@ -1,5 +1,5 @@
 . ./test-lib.sh
-RAILS_VERSION=${RAILS_VERSION-3.0.0.beta4}
+RAILS_VERSION=${RAILS_VERSION-3.0.0.rc2}
 case $RUBY_VERSION in
 1.8.7|1.9.2) ;;
 *)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +00:00
+date: 2010-08-28 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,6 +211,7 @@ files:
 - t/t0006.ru
 - t/t0007-working_directory_no_embed_cli.sh
 - t/t0008-back_out_of_upgrade.sh
+- t/t0009-winch_ttin.sh
 - t/t0300-rails3-basic.sh
 - t/t0301-rails3-missing-config-ru.sh
 - t/t0302-rails3-alt-working_directory.sh