unicorn 0.93.2 → 0.93.3

data/DESIGN

@@ -7,7 +7,7 @@
   all clients down, just one.  Only UNIX-like systems supporting
   fork() and file descriptor inheritance are supported.
 
-* The Ragel->C HTTP parser is taken from Mongrel.  This is the
+* The Ragel+C HTTP parser is taken from Mongrel.  This is the
   only non-Ruby part and there are no plans to add any more
   non-Ruby components.
 

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -46,7 +46,6 @@ inst_deps := $(c_files) $(rb_files) GNUmakefile test/test_helper.rb
 ragel: $(ext)/unicorn_http.c
 $(ext)/unicorn_http.c: $(rl_files)
 	cd $(@D) && $(ragel) unicorn_http.rl -C $(RLFLAGS) -o $(@F)
-	$(ruby) -i -p -e '$$_.gsub!(%r{[ \t]*$$},"")' $@
 $(ext)/Makefile: $(ext)/extconf.rb $(c_files)
 	cd $(@D) && $(ruby) extconf.rb
 $(ext)/unicorn_http.$(DLEXT): $(ext)/Makefile

data/PHILOSOPHY

@@ -101,7 +101,7 @@ A reverse proxy for Unicorn should meet the following requirements:
 nginx is the only (Free) solution we know of that meets the above
 requirements.
 
-Indeed, the author of Unicorn has deployed nginx as a reverse-proxy not
+Indeed, the folks behind Unicorn have deployed nginx as a reverse-proxy not
 only for Ruby applications, but also for production applications running
 Apache/mod_perl, Apache/mod_php and Apache Tomcat.  In every single
 case, performance improved because application servers were able to use
@@ -137,3 +137,8 @@ Unicorn is highly inefficient for Comet/reverse-HTTP/push applications
 where the HTTP connection spends a large amount of time idle.
 Nevertheless, the ease of troubleshooting, debugging, and management of
 Unicorn may still outweigh the drawbacks for these applications.
+
+The {Rainbows!}[http://rainbows.rubyforge.org/] aims to fill the gap for
+odd corner cases where the nginx + Unicorn combination is not enough.
+Keep in mind that Rainbows! is still very new (as of October 2009), far
+more ambitious, and far less tested than Unicorn.

data/README

@@ -1,9 +1,9 @@
-= Unicorn: Rack HTTP server for Unix and fast clients
+= Unicorn: Rack HTTP server for fast clients and Unix
 
-Unicorn is a HTTP server for Rack applications designed to take
-advantage of features in Unix/Unix-like kernels and only serve fast
-clients on low-latency, high-bandwidth connections.  Slow clients should
-only be served by placing a reverse proxy capable of fully-buffering
+Unicorn is a HTTP server for Rack applications designed to only serve
+fast clients on low-latency, high-bandwidth connections and take
+advantage of features in Unix/Unix-like kernels.  Slow clients should
+only be served by placing a reverse proxy capable of fully buffering
 both the the request and response in between Unicorn and slow clients.
 
 == Features
@@ -131,8 +131,8 @@ options.
 == Disclaimer
 
 Like the creatures themselves, production deployments of Unicorn are
-rare or even non-existent.  There is NO WARRANTY whatsoever if anything
-goes wrong, but let us know and we'll try our best to fix it.
+rare.  There is NO WARRANTY whatsoever if anything goes wrong, but let
+us know and we'll try our best to fix it.
 
 Unicorn is designed to only serve fast clients either on the local host
 or a fast LAN.  See the PHILOSOPHY and DESIGN documents for more details

data/examples/init.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-set -u
 set -e
 # Example init script, this can be used with nginx, too,
 # since nginx and unicorn accept the same signals

data/lib/unicorn.rb

@@ -42,7 +42,23 @@ module Unicorn
     # This hash maps PIDs to Workers
     WORKERS = {}
 
-    # See: http://cr.yp.to/docs/selfpipe.html
+    # We use SELF_PIPE differently in the master and worker processes:
+    #
+    # * The master process never closes or reinitializes this once
+    # initialized.  Signal handlers in the master process will write to
+    # it to wake up the master from IO.select in exactly the same manner
+    # djb describes in http://cr.yp.to/docs/selfpipe.html
+    #
+    # * The workers immediately close the pipe they inherit from the
+    # master and replace it with a new pipe after forking.  This new
+    # pipe is also used to wakeup from IO.select from inside (worker)
+    # signal handlers.  However, workers *close* the pipe descriptors in
+    # the signal handlers to raise EBADF in IO.select instead of writing
+    # like we do in the master.  We cannot easily use the reader set for
+    # IO.select because LISTENERS is already that set, and it's extra
+    # work (and cycles) to distinguish the pipe FD from the reader set
+    # once IO.select returns.  So we're lazy and just close the pipe when
+    # a (rare) signal arrives in the worker and reinitialize the pipe later.
     SELF_PIPE = []
 
     # signal queue used for self-piping
@@ -559,13 +575,13 @@ module Unicorn
       nr = 0 # this becomes negative if we need to reopen logs
       alive = worker.tmp # tmp is our lifeline to the master process
       ready = LISTENERS
-      t = ti = 0
 
       # closing anything we IO.select on will raise EBADF
       trap(:USR1) { nr = -65536; SELF_PIPE.first.close rescue nil }
       trap(:QUIT) { alive = nil; LISTENERS.each { |s| s.close rescue nil } }
       [:TERM, :INT].each { |sig| trap(sig) { exit!(0) } } # instant shutdown
       logger.info "worker=#{worker.nr} ready"
+      m = 0
 
       begin
         nr < 0 and reopen_worker_logs(worker.nr)
@@ -579,13 +595,13 @@ module Unicorn
         # changes with chmod doesn't update ctime on all filesystems; so
         # we change our counter each and every time (after process_client
         # and before IO.select).
-        t == (ti = Time.now.to_i) or alive.chmod(t = ti)
+        alive.chmod(m = 0 == m ? 1 : 0)
 
         ready.each do |sock|
           begin
             process_client(sock.accept_nonblock)
             nr += 1
-            t == (ti = Time.now.to_i) or alive.chmod(t = ti)
+            alive.chmod(m = 0 == m ? 1 : 0)
           rescue Errno::EAGAIN, Errno::ECONNABORTED
           end
           break if nr < 0
@@ -598,7 +614,7 @@ module Unicorn
         redo unless nr == 0 # (nr < 0) => reopen logs
 
         ppid == Process.ppid or return
-        alive.chmod(t = 0)
+        alive.chmod(m = 0 == m ? 1 : 0)
         begin
           # timeout used so we can detect parent death:
           ret = IO.select(LISTENERS, nil, SELF_PIPE, timeout) or redo

data/lib/unicorn/configurator.rb

@@ -175,6 +175,23 @@ module Unicorn
     # to the scheduling limitations by the worker process.  Due the
     # low-complexity, low-overhead implementation, timeouts of less
     # than 3.0 seconds can be considered inaccurate and unsafe.
+    #
+    # For running Unicorn behind nginx, it is recommended to set
+    # "fail_timeout=0" for in your nginx configuration like this
+    # to have nginx always retry backends that may have had workers
+    # SIGKILL-ed due to timeouts.
+    #
+    #    # See http://wiki.nginx.org/NginxHttpUpstreamModule for more details
+    #    # on nginx upstream configuration:
+    #    upstream unicorn_backend {
+    #      # for UNIX domain socket setups:
+    #      server unix:/path/to/unicorn.sock fail_timeout=0;
+    #
+    #      # for TCP setups
+    #      server 192.168.0.7:8080 fail_timeout=0;
+    #      server 192.168.0.8:8080 fail_timeout=0;
+    #      server 192.168.0.9:8080 fail_timeout=0;
+    #    }
     def timeout(seconds)
       Numeric === seconds or raise ArgumentError,
                                   "not numeric: timeout=#{seconds.inspect}"

data/lib/unicorn/const.rb

@@ -7,7 +7,7 @@ module Unicorn
   # gave about a 3% to 10% performance improvement over using the strings directly.
   # Symbols did not really improve things much compared to constants.
   module Const
-    UNICORN_VERSION="0.93.2"
+    UNICORN_VERSION="0.93.3"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port

data/unicorn.gemspec

@@ -35,11 +35,11 @@ Gem::Specification.new do |s|
   s.files = manifest
   s.homepage = %q{http://unicorn.bogomips.org/}
 
-  s.rdoc_options = [ "-Na", "-t",
-                     "Unicorn: Rack HTTP server for Unix and fast clients" ]
+  summary = %q{Rack HTTP server for fast clients and Unix}
+  s.rdoc_options = [ "-Na", "-t", "Unicorn: #{summary}" ]
   s.require_paths = %w(lib ext)
   s.rubyforge_project = %q{mongrel}
-  s.summary = %q{Rack HTTP server for Unix and fast clients}
+  s.summary = summary
 
   s.test_files = test_files
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.93.2
+  version: 0.93.3
 platform: ruby
 authors: 
 - Unicorn developers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -07:00
+date: 2009-10-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,10 +23,10 @@ dependencies:
         version: "0"
     version: 
 description: |-
-  Unicorn is a HTTP server for Rack applications designed to take
-  advantage of features in Unix/Unix-like kernels and only serve fast
-  clients on low-latency, high-bandwidth connections.  Slow clients should
-  only be served by placing a reverse proxy capable of fully-buffering
+  Unicorn is a HTTP server for Rack applications designed to only serve
+  fast clients on low-latency, high-bandwidth connections and take
+  advantage of features in Unix/Unix-like kernels.  Slow clients should
+  only be served by placing a reverse proxy capable of fully buffering
   both the the request and response in between Unicorn and slow clients.
 email: mongrel-unicorn@rubyforge.org
 executables: 
@@ -223,7 +223,7 @@ post_install_message:
 rdoc_options: 
 - -Na
 - -t
-- "Unicorn: Rack HTTP server for Unix and fast clients"
+- "Unicorn: Rack HTTP server for fast clients and Unix"
 require_paths: 
 - lib
 - ext
@@ -245,7 +245,7 @@ rubyforge_project: mongrel
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Rack HTTP server for Unix and fast clients
+summary: Rack HTTP server for fast clients and Unix
 test_files: 
 - test/unit/test_configurator.rb
 - test/unit/test_http_parser.rb