rainbows 0.90.2 → 0.91.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -58,7 +58,7 @@ NEWS: GIT-VERSION-FILE
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE = 0.9.0
+SINCE = 0.90.0
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)

data/bin/rainbows

@@ -113,49 +113,11 @@ end
 config = ARGV[0] || "config.ru"
 abort "configuration file #{config} not found" unless File.exist?(config)
 
-if config =~ /\.ru$/
-  # parse embedded command-line options in config.ru comments
-  if File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) } =~ /^#\\(.*)/
-    opts.parse! $1.split(/\s+/)
-  end
-end
-
-require 'pp' if $DEBUG
-
-app = lambda do ||
-  # require Rack as late as possible in case $LOAD_PATH is modified
-  # in config.ru or command-line
-  inner_app = case config
-  when /\.ru$/
-    raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
-    raw.sub!(/^__END__\n.*/, '')
-    eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config)
-  else
-    require config
-    Object.const_get(File.basename(config, '.rb').capitalize)
-  end
-  pp({ :inner_app => inner_app }) if $DEBUG
-  case ENV["RACK_ENV"]
-  when "development"
-    Rack::Builder.new do
-      use Rack::CommonLogger, $stderr
-      use Rack::ShowExceptions
-      use Rack::Lint
-      run inner_app
-    end.to_app
-  when "deployment"
-    Rack::Builder.new do
-      use Rack::CommonLogger, $stderr
-      run inner_app
-    end.to_app
-  else
-    inner_app
-  end
-end
-
+app = Unicorn.builder(config, opts)
 listeners << "#{host}:#{port}" if set_listener
 
 if $DEBUG
+  require 'pp'
   pp({
     :unicorn_options => options,
     :app => app,
@@ -163,5 +125,5 @@ if $DEBUG
   })
 end
 
-Unicorn::Launcher.daemonize! if daemonize
+Unicorn::Launcher.daemonize!(options) if daemonize
 Rainbows.run(app, options)

data/lib/rainbows.rb

@@ -22,7 +22,7 @@ module Rainbows
       false
     end
   end
-  G = State.new(true, 0, 0, 2)
+  G = State.new(true, 0, 0, 5)
   O = {}
 
   require 'rainbows/const'
@@ -59,30 +59,19 @@ module Rainbows
     end
 
     # returns nil if accept fails
-    if defined?(Fcntl::FD_CLOEXEC)
-      def sync_accept(sock)
-        rv = sock.accept
-        rv.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-        rv
-      rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EINTR
-      end
-
-      def accept(sock)
-        rv = sock.accept_nonblock
-        rv.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-        rv
-      rescue Errno::EAGAIN, Errno::ECONNABORTED
-      end
-    else
-      def sync_accept(sock)
-        sock.accept
-      rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EINTR
-      end
+    def sync_accept(sock)
+      rv = sock.accept
+      rv.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      rv
+    rescue Errno::EAGAIN, Errno::ECONNABORTED, Errno::EINTR
+    end
 
-      def accept(sock)
-        sock.accept_nonblock
-      rescue Errno::EAGAIN, Errno::ECONNABORTED
-      end
+    # returns nil if accept fails
+    def accept(sock)
+      rv = sock.accept_nonblock
+      rv.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      rv
+    rescue Errno::EAGAIN, Errno::ECONNABORTED
     end
   end
 

data/lib/rainbows/const.rb

@@ -3,7 +3,7 @@
 module Rainbows
 
   module Const
-    RAINBOWS_VERSION = '0.90.2'
+    RAINBOWS_VERSION = '0.91.0'
 
     include Unicorn::Const
 

data/lib/rainbows/error.rb

@@ -28,7 +28,8 @@ module Rainbows
 
       def response(e)
         case e
-        when EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL,Errno::EBADF
+        when EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL,
+             Errno::EBADF, Errno::ENOTCONN
           # swallow error if client shuts down one end or disconnects
         when Unicorn::HttpParserError
           Const::ERROR_400_RESPONSE # try to tell the client they're bad

data/lib/rainbows/ev_core.rb

@@ -50,7 +50,7 @@ module Rainbows
             @env.delete(HTTP_EXPECT)
           end
           @input = len && len <= MAX_BODY ? StringIO.new("") : Util.tmpio
-          @hp.filter_body(@buf2 = @buf.dup, @buf)
+          @hp.filter_body(@buf2 = "", @buf)
           @input << @buf2
           on_read("")
         end

data/lib/rainbows/fiber/base.rb

@@ -5,13 +5,13 @@ module Rainbows
   module Fiber
 
     # blocked readers (key: Rainbows::Fiber::IO object, value is irrelevant)
-    RD = {}
+    RD = {}.compare_by_identity
 
     # blocked writers (key: Rainbows::Fiber::IO object, value is irrelevant)
-    WR = {}
+    WR = {}.compare_by_identity
 
     # sleeping fibers go here (key: Fiber object, value: wakeup time)
-    ZZ = {}
+    ZZ = {}.compare_by_identity
 
     # puts the current Fiber into uninterruptible sleep for at least
     # +seconds+.  Unlike Kernel#sleep, this it is not possible to sleep
@@ -103,10 +103,8 @@ module Rainbows
         Error.write(io, e)
       ensure
         G.cur -= 1
-        RD.delete(client)
-        WR.delete(client)
         ZZ.delete(client.f)
-        io.close unless io.closed?
+        client.close
       end
 
     end

data/lib/rainbows/fiber/io.rb

@@ -19,7 +19,9 @@ module Rainbows
       end
 
       def close
-        to_io.close
+        RD.delete(self)
+        WR.delete(self)
+        to_io.close unless to_io.closed?
       end
 
       def wait_readable

data/lib/rainbows/rev.rb

@@ -31,6 +31,11 @@ module Rainbows
     # all connected clients
     CONN = {}
 
+    if {}.respond_to?(:compare_by_identity)
+      CONN.compare_by_identity
+      KATO.compare_by_identity
+    end
+
     include Core
   end
 end

data/lib/rainbows/revactor.rb

@@ -30,8 +30,8 @@ module Rainbows
     # once a client is accepted, it is processed in its entirety here
     # in 3 easy steps: read request, call app, write app response
     def process_client(client)
-      defined?(Fcntl::FD_CLOEXEC) and
-        client.instance_eval { @_io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) }
+      io = client.instance_variable_get(:@_io)
+      io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
       rd_args = [ nil ]
       remote_addr = if ::Revactor::TCP::Socket === client
         rd_args << RD_ARGS
@@ -68,7 +68,7 @@ module Rainbows
       end while alive and hp.reset.nil? and env.clear
     rescue ::Revactor::TCP::ReadError
     rescue => e
-      Error.write(client.instance_eval { @_io }, e)
+      Error.write(io, e)
     ensure
       client.close
     end
@@ -86,7 +86,7 @@ module Rainbows
       revactorize_listeners.each do |l, close, accept|
         Actor.spawn(l, close, accept) do |l, close, accept|
           Actor.current.trap_exit = true
-          l.controller = l.instance_eval { @receiver = Actor.current }
+          l.controller = l.instance_variable_set(:@receiver, Actor.current)
           begin
             while nr >= limit
               l.disable if l.enabled?
@@ -118,7 +118,8 @@ module Rainbows
       end
 
       Actor.sleep 1 while G.tick || nr > 0
-      rescue Errno::EMFILE => e
+      rescue Errno::EMFILE
+        # ignore, let another worker process take it
     end
 
     def revactorize_listeners

data/lib/rainbows/revactor/tee_input.rb

@@ -22,11 +22,11 @@ module Rainbows
       def tee(length, dst)
         unless parser.body_eof?
           if parser.filter_body(dst, buf << socket.read).nil?
-            @tmp.write(dst)
+            tmp.write(dst)
             diff = dst.size - length
             if diff > 0
               dst.replace(dst[0,length])
-              @tmp.seek(-diff, IO::SEEK_CUR)
+              tmp.seek(-diff, IO::SEEK_CUR)
             end
             return dst
           end

data/rainbows.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   # we need Unicorn for the HTTP parser and process management
   # The HTTP parser in Unicorn < 0.96.1 did not use the Ruby
   # API correctly and resulted in a memory leak
-  s.add_dependency(%q<unicorn>, ["~> 0.96.1", "< 0.97.0"])
+  s.add_dependency(%q<unicorn>, ["~> 0.97.0"])
 
   # Unicorn already depends on Rack
   # s.add_dependency(%q<rack>)

data/t/t0013-reload-bad-config.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 7 "reload config.ru error with preload_app true"
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rtmpfiles ru
+
+	cat > $ru <<\EOF
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+x = { "hello" => "world" }
+run lambda { |env| [ 200, {}, [ x.inspect << "\n" ] ] }
+EOF
+	echo 'preload_app true' >> $unicorn_config
+	rainbows -D -c $unicorn_config $ru
+	rainbows_wait_start
+}
+
+t_begin "hit with curl" && {
+	out=$(curl -sSf http://$listen/)
+	test x"$out" = x'{"hello"=>"world"}'
+}
+
+t_begin "introduce syntax error in rackup file" && {
+	echo '...' >> $ru
+}
+
+t_begin "reload signal succeeds" && {
+	kill -HUP $rainbows_pid
+	rainbows_wait_start
+	while ! egrep '(done|error) reloading' $r_err >/dev/null
+	do
+		sleep 1
+	done
+
+	grep 'error reloading' $r_err >/dev/null
+	> $r_err
+}
+
+t_begin "hit with curl" && {
+	out=$(curl -sSf http://$listen/)
+	test x"$out" = x'{"hello"=>"world"}'
+}
+
+t_begin "killing succeeds" && {
+	kill $rainbows_pid
+}
+
+t_begin "check stderr" && {
+	check_stderr
+}
+
+t_done

data/t/t0014-config-conflict.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 6 "config variables conflict with preload_app"
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rtmpfiles ru rutmp
+
+	cat > $ru <<\EOF
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+config = ru = { "hello" => "world" }
+run lambda { |env| [ 200, {}, [ ru.inspect << "\n" ] ] }
+EOF
+	echo 'preload_app true' >> $unicorn_config
+	rainbows -D -c $unicorn_config $ru
+	rainbows_wait_start
+}
+
+t_begin "hit with curl" && {
+	out=$(curl -sSf http://$listen/)
+	test x"$out" = x'{"hello"=>"world"}'
+}
+
+t_begin "modify rackup file" && {
+	sed -e 's/world/WORLD/' < $ru > $rutmp
+	mv $rutmp $ru
+}
+
+t_begin "reload signal succeeds" && {
+	kill -HUP $rainbows_pid
+	rainbows_wait_start
+	while ! egrep '(done|error) reloading' < $r_err >/dev/null
+	do
+		sleep 1
+	done
+
+	grep 'done reloading' $r_err >/dev/null
+}
+
+t_begin "hit with curl" && {
+	out=$(curl -sSf http://$listen/)
+	test x"$out" = x'{"hello"=>"WORLD"}'
+}
+
+t_begin "killing succeeds" && {
+	kill $rainbows_pid
+}
+
+t_done

data/t/test-lib.sh

@@ -99,13 +99,7 @@ pid "$pid"
 stderr_path "$r_err"
 stdout_path "$r_out"
 
-# close my-tap-lib.sh FDs
-unless ENV['UNICORN_FD']
-  IO.for_fd(3).close rescue nil
-  IO.for_fd(4).close rescue nil
-end
-
-before_fork do |server, worker|
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  version: 0.90.2
+  version: 0.91.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +00:00
+date: 2010-03-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.96.1
-    - - <
       - !ruby/object:Gem::Version 
         version: 0.97.0
     version: 
@@ -202,6 +199,8 @@ files:
 - t/t0010-keepalive-timeout-effective.sh
 - t/t0011-close-on-exec-set.sh
 - t/t0012-spurious-wakeups-quiet.sh
+- t/t0013-reload-bad-config.sh
+- t/t0014-config-conflict.sh
 - t/t0100-rack-input-hammer.sh
 - t/t0101-rack-input-trailer.sh
 - t/t0102-rack-input-short.sh