unicorn 0.2.3 → 0.4.1

data/.document

@@ -1,6 +1,6 @@
 README
+PHILOSOPHY
 DESIGN
-CHANGELOG
 CONTRIBUTORS
 LICENSE
 SIGNALS

data/.gitignore

@@ -10,3 +10,4 @@
 ext/unicorn/http11/Makefile
 log/
 pkg/
+/vendor

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.4.1 - Rails support, per-listener backlog and {snd,rcv}buf
 v0.2.3 - Unlink Tempfiles after use (they were closed, just not unlinked)
 v0.2.2 - small bug fixes, fix Rack multi-value headers (Set-Cookie:)
 v0.2.1 - Fix broken Manifest that cause unicorn_rails to not be bundled

data/DESIGN

@@ -79,3 +79,7 @@
 * If the master process dies unexpectedly for any reason,
   workers will notice within :timeout/2 seconds and follow
   the master to its death.
+
+* There is never any explicit real-time dependency or communication
+  between the worker processes themselves nor to the master process.
+  Synchronization is handled entirely by the OS kernel.

data/GNUmakefile

@@ -13,12 +13,15 @@ endif
 # dunno how to implement this as concisely in Ruby, and hell, I love awk
 awk_slow := awk '/def test_/{print FILENAME"--"$$2".n"}' 2>/dev/null
 
+rails_vers := $(subst test/rails/app-,,$(wildcard test/rails/app-*))
 slow_tests := test/unit/test_server.rb test/exec/test_exec.rb
 log_suffix = .$(RUBY_VERSION).log
-T := $(filter-out $(slow_tests),$(wildcard test/*/test*.rb))
+T_r := $(wildcard test/rails/test*.rb)
+T := $(filter-out $(slow_tests) $(T_r), $(wildcard test/*/test*.rb))
 T_n := $(shell $(awk_slow) $(slow_tests))
 T_log := $(subst .rb,$(log_suffix),$(T))
 T_n_log := $(subst .n,$(log_suffix),$(T_n))
+T_r_log := $(subst .r,$(log_suffix),$(T_r))
 test_prefix = $(CURDIR)/test/install-$(RUBY_VERSION)
 
 http11_deps := $(addprefix ext/unicorn/http11/, \
@@ -49,22 +52,23 @@ install-test:
 	$(MAKE) -C $(test_prefix) http11 shebang
 
 # this is only intended to be run within $(test_prefix)
-shebang: bin/unicorn
-	$(ruby) -i -p -e '$$_.gsub!(%r{^#!.*$$},"#!$(ruby_bin)")' $<
+shebang: bin/unicorn bin/unicorn_rails
+	$(ruby) -i -p -e '$$_.gsub!(%r{^#!.*$$},"#!$(ruby_bin)")' $^
 
 t_log := $(T_log) $(T_n_log)
 test: $(T) $(T_n)
 	@cat $(t_log) | $(ruby) test/aggregate.rb
 	@$(RM) $(t_log)
 
-slow-tests: $(slow_tests)
+test-exec: $(wildcard test/exec/test_*.rb)
+test-unit: $(wildcard test/unit/test_*.rb)
 $(slow_tests):
 	@$(MAKE) $(shell $(awk_slow) $@)
 
 TEST_OPTS = -v
-run_test = @echo '*** $(arg) ***'; \
+run_test = @echo '*** $(arg)$(extra) ***'; \
   setsid $(ruby) $(arg) $(TEST_OPTS) >$(t) 2>&1 || \
-  (cat >&2 < $(t); exit 1)
+  (sed "s,^,$(extra): ," >&2 < $(t); exit 1)
 
 %.n: arg = $(subst .n,,$(subst --, -n ,$@))
 %.n: t = $(subst .n,$(log_suffix),$@)
@@ -108,4 +112,24 @@ Manifest:
 doc: .document
 	rdoc -Na -m README -t "$(shell sed -ne '1s/^= //p' README)"
 
+rails_git_url = git://github.com/rails/rails.git
+rails_git := vendor/rails.git
+$(rails_git)/info/cloned-stamp:
+	git clone --mirror -q $(rails_git_url) $(rails_git)
+	> $@
+
+rails_tests := $(addsuffix .r,$(addprefix $(T_r).,$(rails_vers)))
+test-rails: $(rails_tests)
+$(T_r).%.r: t = $(addsuffix $(log_suffix),$@)
+$(T_r).%.r: rv = $(subst .r,,$(subst $(T_r).,,$@))
+$(T_r).%.r: extra = ' 'v$(rv)
+$(T_r).%.r: arg = $(T_r)
+$(T_r).%.r: export PATH := $(test_prefix)/bin:$(PATH)
+$(T_r).%.r: export RUBYLIB := $(test_prefix)/lib:$(RUBYLIB)
+$(T_r).%.r: export UNICORN_RAILS_TEST_VERSION = $(rv)
+$(T_r).%.r: export RAILS_GIT_REPO = $(CURDIR)/$(rails_git)
+$(T_r).%.r: $(test_prefix)/.stamp $(rails_git)/info/cloned-stamp
+	$(run_test)
+	@sed 's,^,$(rv): ,' < $(t)
+
 .PHONY: doc $(T) $(slow_tests) Manifest

data/Manifest

@@ -21,6 +21,9 @@ ext/unicorn/http11/http11_parser.rl
 ext/unicorn/http11/http11_parser_common.rl
 lib/unicorn.rb
 lib/unicorn/app/exec_cgi.rb
+lib/unicorn/app/old_rails.rb
+lib/unicorn/app/old_rails/static.rb
+lib/unicorn/cgi_wrapper.rb
 lib/unicorn/configurator.rb
 lib/unicorn/const.rb
 lib/unicorn/http_request.rb
@@ -30,11 +33,66 @@ lib/unicorn/socket.rb
 lib/unicorn/util.rb
 setup.rb
 test/aggregate.rb
-test/benchmark/previous.rb
-test/benchmark/simple.rb
-test/benchmark/utils.rb
+test/benchmark/README
+test/benchmark/big_request.rb
+test/benchmark/dd.ru
+test/benchmark/request.rb
+test/benchmark/response.rb
 test/exec/README
 test/exec/test_exec.rb
+test/rails/app-1.2.3/.gitignore
+test/rails/app-1.2.3/app/controllers/application.rb
+test/rails/app-1.2.3/app/controllers/foo_controller.rb
+test/rails/app-1.2.3/app/helpers/application_helper.rb
+test/rails/app-1.2.3/config/boot.rb
+test/rails/app-1.2.3/config/database.yml
+test/rails/app-1.2.3/config/environment.rb
+test/rails/app-1.2.3/config/environments/development.rb
+test/rails/app-1.2.3/config/environments/production.rb
+test/rails/app-1.2.3/config/routes.rb
+test/rails/app-1.2.3/db/.gitignore
+test/rails/app-1.2.3/public/404.html
+test/rails/app-1.2.3/public/500.html
+test/rails/app-2.0.2/.gitignore
+test/rails/app-2.0.2/app/controllers/application.rb
+test/rails/app-2.0.2/app/controllers/foo_controller.rb
+test/rails/app-2.0.2/app/helpers/application_helper.rb
+test/rails/app-2.0.2/config/boot.rb
+test/rails/app-2.0.2/config/database.yml
+test/rails/app-2.0.2/config/environment.rb
+test/rails/app-2.0.2/config/environments/development.rb
+test/rails/app-2.0.2/config/environments/production.rb
+test/rails/app-2.0.2/config/routes.rb
+test/rails/app-2.0.2/db/.gitignore
+test/rails/app-2.0.2/public/404.html
+test/rails/app-2.0.2/public/500.html
+test/rails/app-2.2.2/.gitignore
+test/rails/app-2.2.2/app/controllers/application.rb
+test/rails/app-2.2.2/app/controllers/foo_controller.rb
+test/rails/app-2.2.2/app/helpers/application_helper.rb
+test/rails/app-2.2.2/config/boot.rb
+test/rails/app-2.2.2/config/database.yml
+test/rails/app-2.2.2/config/environment.rb
+test/rails/app-2.2.2/config/environments/development.rb
+test/rails/app-2.2.2/config/environments/production.rb
+test/rails/app-2.2.2/config/routes.rb
+test/rails/app-2.2.2/db/.gitignore
+test/rails/app-2.2.2/public/404.html
+test/rails/app-2.2.2/public/500.html
+test/rails/app-2.3.2.1/.gitignore
+test/rails/app-2.3.2.1/app/controllers/application_controller.rb
+test/rails/app-2.3.2.1/app/controllers/foo_controller.rb
+test/rails/app-2.3.2.1/app/helpers/application_helper.rb
+test/rails/app-2.3.2.1/config/boot.rb
+test/rails/app-2.3.2.1/config/database.yml
+test/rails/app-2.3.2.1/config/environment.rb
+test/rails/app-2.3.2.1/config/environments/development.rb
+test/rails/app-2.3.2.1/config/environments/production.rb
+test/rails/app-2.3.2.1/config/routes.rb
+test/rails/app-2.3.2.1/db/.gitignore
+test/rails/app-2.3.2.1/public/404.html
+test/rails/app-2.3.2.1/public/500.html
+test/rails/test_rails.rb
 test/test_helper.rb
 test/tools/trickletest.rb
 test/unit/test_configurator.rb
@@ -42,4 +100,5 @@ test/unit/test_http_parser.rb
 test/unit/test_request.rb
 test/unit/test_response.rb
 test/unit/test_server.rb
+test/unit/test_socket_helper.rb
 test/unit/test_upload.rb

data/README

@@ -1,36 +1,48 @@
-= Unicorn: UNIX + LAN/localhost-only fork of Mongrel
+= Unicorn: Unix + LAN/localhost-optimized fork of Mongrel
 
-Only run this behind a full-HTTP-request-buffering reverse proxy if
-you're serving slow clients.  That said, nginx is the only reverse
-proxy we know of that meets this requirement.
+Unicorn is designed to only serve fast clients.  See the PHILOSOPHY
+and DESIGN documents for more details regarding this.
 
 == Features
 
-* process management: Unicorn will reap and restart workers that
-  die because of broken apps and there is no need to manage
-  multiple processes yourself.
+* Built on the solid Mongrel code base and takes full advantage
+  of functionality exclusive to Unix-like operating systems.
 
-* does not care if your application is thread-safe or not, workers
+* Mostly written in Ruby, only the HTTP parser (stolen and trimmed
+  down from Mongrel) is written in C.  Unicorn is compatible with
+  both Ruby 1.8 and 1.9.
+
+* Process management: Unicorn will reap and restart workers that
+  die from broken apps.  There is no need to manage multiple processes
+  yourself.
+
+* Load balancing is done entirely by the operating system kernel.
+  Requests never pile up behind a busy worker.
+
+* Does not care if your application is thread-safe or not, workers
   all run within their own isolated address space and only serve one
   client at a time...
 
-* able to listen on multiple interfaces, including UNIX sockets,
-  each worker process can also bind to a private port via the
-  after_fork hook for easy debugging.
+* Supports all Rack applications, along with pre-Rack versions of
+  Ruby on Rails via a Rack wrapper.
 
-* supports all Rack applications
+* Builtin log rotation of all log files in your application via USR1
+  signal.
 
 * nginx-style binary re-execution without losing connections.
-  You can upgrade unicorn, your entire application, libraries
-  and even your Ruby interpreter as long as unicorn is
+  You can upgrade Unicorn, your entire application, libraries
+  and even your Ruby interpreter as long as Unicorn is
   installed in the same path.
 
 * before_fork and after_fork hooks in case your application
   has special needs when dealing with forked processes.
 
-* builtin log rotation via USR1 signal
+* Can be used with copy-on-write-friendly memory management
+  to save memory.
 
-* Ruby 1.9-compatible (at least the test cases all pass :>)
+* Able to listen on multiple interfaces including UNIX sockets,
+  each worker process can also bind to a private port via the
+  after_fork hook for easy debugging.
 
 == License
 
@@ -41,6 +53,8 @@ Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed
 under the Ruby license and the GPL2. See the include LICENSE file for
 details.
 
+Unicorn is 100% Free Software.
+
 == Install
 
 The library consists of a C extension so you'll need a C compiler or at
@@ -74,45 +88,41 @@ your web browser and download the latest snapshot tarballs here:
 
 === non-Rails Rack applications
 
-Unicorn will look for the config.ru file used by rackup in APP_ROOT.
-Optionally, it can use a config file for unicorn-specific options
-specified by the --config-file/-c command-line switch.  See
-Unicorn::Configurator for the syntax of the unicorn-specific
-config options.
-
-In APP_ROOT, just run:
+In APP_ROOT, run:
 
   unicorn
 
-Unicorn should be capable of running most Rack applications.  Since this
-is a preforking webserver, you do not have to worry about thread-safety
-of your application or libraries. However, your Rack application may use
-threads internally (and should even be able to continue running threads
-after the request is complete).
-
-=== Rack-enabled versions of Rails (v2.3.2+)
+=== for Rails applications (should work for all 1.2 or later versions)
 
 In RAILS_ROOT, run:
 
   unicorn_rails
 
+Unicorn will bind to all interfaces TCP port 8080 by default.
+You may use the '-l/--listen' switch to bind to a different
+address:port or a UNIX socket.
+
+=== Configuration File(s)
+
+Unicorn will look for the config.ru file used by rackup in APP_ROOT.
+
+For deployments, it can use a config file for Unicorn-specific options
+specified by the --config-file/-c command-line switch.  See
+Unicorn::Configurator for the syntax of the Unicorn-specific options.
+The default settings are designed for maximum out-of-the-box
+compatibility with existing applications.
+
 Most command-line options for other Rack applications (above) are also
-supported.  The unicorn_rails launcher attempts to combine the best
-features of the Rails-bundled "script/server" with the "rackup"-like
-functionality of the `unicorn' launcher.
+supported.  Run `unicorn -h` or `unicorn_rails -h` to see command-line
+options.
 
 == Disclaimer
 
-There are only a few instances of Unicorn deployed anywhere in the
-world.  The only public site known to run Unicorn at this time is
-http://git.bogomips.org/cgit which runs Unicorn::App::ExecCgi to
-fork()+exec() cgit.
+Like the creatures themselves, production deployments of Unicorn are rare.
+There is NO WARRANTY whatsoever if anything goes wrong, but let us know and
+we'll try our best to fix it.
 
-Be one of the first brave guinea pigs to run it on your production site!
-Of course there is NO WARRANTY whatsoever if anything goes wrong, but
-let us know and we'll try our best to fix it.  Unicorn is still in the
-early stages and testing + feedback would be *greatly* appreciated;
-maybe you'll get Rainbows as a reward!
+Rainbows are NOT included.
 
 == Known Issues
 

data/SIGNALS

@@ -61,27 +61,27 @@ The procedure is exactly like that of nginx:
    of unicorn running now, both of which will have workers servicing
    requests.  Your process tree should look something like this:
 
-   unicorn master (old)
-   \_ unicorn worker[0]
-   \_ unicorn worker[1]
-   \_ unicorn worker[2]
-   \_ unicorn worker[3]
-   \_ unicorn master
-      \_ unicorn worker[0]
-      \_ unicorn worker[1]
-      \_ unicorn worker[2]
-      \_ unicorn worker[3]
-
-4. You can now send WINCH to the old master process so only the new workers
+     unicorn master (old)
+     \_ unicorn worker[0]
+     \_ unicorn worker[1]
+     \_ unicorn worker[2]
+     \_ unicorn worker[3]
+     \_ unicorn master
+        \_ unicorn worker[0]
+        \_ unicorn worker[1]
+        \_ unicorn worker[2]
+        \_ unicorn worker[3]
+
+3. You can now send WINCH to the old master process so only the new workers
    serve requests.  If your unicorn process is bound to an interactive
    terminal, you can skip this step.  Step 5 will be more difficult but
    you can also skip it if your process is not daemonized.
 
-5. You should now ensure that everything is running correctly with the
+4. You should now ensure that everything is running correctly with the
    new workers as the old workers die off.
 
-6a. If everything seems ok, then send QUIT to the old master.  You're done!
+5. If everything seems ok, then send QUIT to the old master.  You're done!
 
-6b. If something is broken, then send HUP to the old master to reload
-    the config and restart its workers.  Then send QUIT to the new master
-    process.
+   If something is broken, then send HUP to the old master to reload
+   the config and restart its workers.  Then send QUIT to the new master
+   process.

data/TODO

@@ -1,5 +1,27 @@
-tests for timeouts
-Performance
-QA behaviour on 1.9
-X Make sure Echoe doesn't activate itself in packaged gems
-Optimize Rack's dispatcher http://github.com/chneukirchen/rack/blob/cf040ea68a6a60a11f484a2145d2e62c34e7487e/lib/rack/urlmap.rb
+== 1.0.0
+
+  * tests for preload_app boolean
+
+  * reexec_worker_processes config option:
+    This is the number of worker processes to startup initially
+    when being reexecuted.
+
+    Default: worker_processes/2 + 1
+
+  * integration tests with nginx including bad client handling
+
+  * tests for timeout
+
+  * manpages (why do so few Ruby executables come with proper manpages?)
+
+== 1.1.0
+
+  * Transfer-Encoding: chunked request handling.  Testcase:
+
+      curl -T- http://host:port/path < file_from_stdin
+
+  * code cleanups (launchers)
+
+  * Pure Ruby HTTP parser
+
+  * Rubinius support?

data/bin/unicorn

@@ -6,8 +6,8 @@ env = "development"
 daemonize = false
 listeners = []
 options = { :listeners => listeners }
-host = Unicorn::Const::DEFAULT_HOST
-port = Unicorn::Const::DEFAULT_PORT
+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)} " \
@@ -46,11 +46,13 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   opts.on("-o", "--host HOST",
           "listen on HOST (default: #{Unicorn::Const::DEFAULT_HOST})") do |h|
     host = h
+    set_listener = true
   end
 
   opts.on("-p", "--port PORT",
           "use PORT (default: #{Unicorn::Const::DEFAULT_PORT})") do |p|
     port = p.to_i
+    set_listener = true
   end
 
   opts.on("-E", "--env ENVIRONMENT",
@@ -103,22 +105,25 @@ opts = OptionParser.new("", 24, '  ') do |opts|
   opts.parse! ARGV
 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
 
 # require Rack as late as possible in case $LOAD_PATH is modified
 # in config.ru or command-line
 require 'rack'
 
-config = ARGV[0] || "config.ru"
-abort "configuration file #{config} not found" unless File.exist?(config)
-
 inner_app = case config
 when /\.ru$/
   raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
-  # parse embedded command-line options in config.ru comments
-  if raw[/^#\\(.*)/]
-    opts.parse! $1.split(/\s+/)
-  end
   lambda { || eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config) }
 else
   lambda do ||
@@ -148,10 +153,7 @@ else
   inner_app
 end
 
-if listeners.empty?
-  listener = "#{host}:#{port}"
-  listeners << listener
-end
+listeners << "#{host}:#{port}" if set_listener
 
 if $DEBUG
   pp({