unicorn 0.99.0 → 0.990.0

data/examples/unicorn.conf.minimal.rb

@@ -0,0 +1,13 @@
+# Minimal sample configuration file for Unicorn (not Rack) when used
+# with daemonization (unicorn -D) started in your working directory.
+#
+# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
+# documentation.
+# See also http://unicorn.bogomips.org/examples/unicorn.conf.rb for
+# a more verbose configuration using more features.
+
+listen 2007 # by default Unicorn listens on port 8080
+worker_processes 2 # this should be >= nr_cpus
+pid "/path/to/app/shared/pids/unicorn.pid"
+stderr_path "/path/to/app/shared/log/unicorn.log"
+stdout_path "/path/to/app/shared/log/unicorn.log"

data/examples/unicorn.conf.rb

@@ -1,4 +1,9 @@
-# Sample configuration file for Unicorn (not Rack)
+# Sample verbose configuration file for Unicorn (not Rack)
+#
+# This configuration file documents many features of Unicorn
+# that may not be needed for some applications. See
+# http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb
+# for a much simpler configuration file.
 #
 # See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
 # documentation.
@@ -22,8 +27,9 @@ timeout 30
 # feel free to point this anywhere accessible on the filesystem
 pid "/path/to/app/shared/pids/unicorn.pid"
 
-# some applications/frameworks log to stderr or stdout, so prevent
-# them from going to /dev/null when daemonized here:
+# By default, the Unicorn logger will write to stderr.
+# Additionally, ome applications/frameworks log to stderr or stdout,
+# so prevent them from going to /dev/null when daemonized here:
 stderr_path "/path/to/app/shared/log/unicorn.stderr.log"
 stdout_path "/path/to/app/shared/log/unicorn.stdout.log"
 

data/ext/unicorn_http/unicorn_http.rl

@@ -173,8 +173,20 @@ static void write_value(VALUE req, struct http_parser *hp,
   VALIDATE_MAX_LENGTH(LEN(mark, p), FIELD_VALUE);
   v = LEN(mark, p) == 0 ? rb_str_buf_new(128) : STR_NEW(mark, p);
   if (NIL_P(f)) {
-    VALIDATE_MAX_LENGTH(hp->s.field_len, FIELD_NAME);
-    f = uncommon_field(PTR_TO(start.field), hp->s.field_len);
+    const char *field = PTR_TO(start.field);
+    size_t flen = hp->s.field_len;
+
+    VALIDATE_MAX_LENGTH(flen, FIELD_NAME);
+
+    /*
+     * ignore "Version" headers since they conflict with the HTTP_VERSION
+     * rack env variable.
+     */
+    if (CONST_MEM_EQ("VERSION", field, flen)) {
+      hp->cont = Qnil;
+      return;
+    }
+    f = uncommon_field(field, flen);
   } else if (f == g_http_connection) {
     hp_keepalive_connection(hp, v);
   } else if (f == g_content_length) {

data/ext/unicorn_http/unicorn_http_common.rl

@@ -54,7 +54,7 @@
 
   value_cont = lws+ any* >start_value %write_cont_value;
 
-  message_header = ((field_name ":" " "* field_value)|value_cont) :> CRLF;
+  message_header = ((field_name ":" lws* field_value)|value_cont) :> CRLF;
   chunk_ext_val = token*;
   chunk_ext_name = token*;
   chunk_extension = ( ";" " "* chunk_ext_name ("=" chunk_ext_val)? )*;

data/lib/unicorn.rb

@@ -137,12 +137,6 @@ module Unicorn
     # * :cwd - the working directory of the application, this is where
     # you originally started Unicorn.
     #
-    # The following example may be used in your Unicorn config file to
-    # change your working directory during a config reload (HUP) without
-    # upgrading or restarting:
-    #
-    #   Dir.chdir(Unicorn::HttpServer::START_CTX[:cwd] = path)
-    #
     # To change your unicorn executable to a different path without downtime,
     # you can set the following in your Unicorn config file, HUP and then
     # continue with the traditional USR2 + QUIT upgrade steps:
@@ -489,11 +483,11 @@ module Unicorn
     # Wake up every second anyways to run murder_lazy_workers
     def master_sleep(sec)
       begin
-        ready = IO.select([SELF_PIPE.first], nil, nil, sec) or return
-        ready.first && ready.first.first or return
-        loop { SELF_PIPE.first.read_nonblock(Const::CHUNK_SIZE) }
+        IO.select([ SELF_PIPE.first ], nil, nil, sec) or return
+        SELF_PIPE.first.read_nonblock(Const::CHUNK_SIZE, HttpRequest::BUF)
       rescue Errno::EAGAIN, Errno::EINTR
-      end
+        break
+      end while true
     end
 
     def awaken_master
@@ -797,7 +791,7 @@ module Unicorn
         logger.info "done reloading config_file=#{config.config_file}"
       rescue StandardError, LoadError, SyntaxError => e
         logger.error "error reloading config_file=#{config.config_file}: " \
-                     "#{e.class} #{e.message}"
+                     "#{e.class} #{e.message} #{e.backtrace}"
         self.app = loaded_app
       end
     end

data/lib/unicorn/configurator.rb

@@ -7,9 +7,11 @@ module Unicorn
 
   # Implements a simple DSL for configuring a Unicorn server.
   #
-  # See http://unicorn.bogomips.org/examples/unicorn.conf.rb for an
-  # example config file.  An example config file for use with nginx is
-  # also available at http://unicorn.bogomips.org/examples/nginx.conf
+  # See http://unicorn.bogomips.org/examples/unicorn.conf.rb and
+  # http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb
+  # example configuration files.  An example config file for use with
+  # nginx is also available at
+  # http://unicorn.bogomips.org/examples/nginx.conf
   class Configurator < Struct.new(:set, :config_file, :after_reload)
 
     # Default settings for Unicorn
@@ -54,7 +56,7 @@ module Unicorn
       [ :pid, :stderr_path, :stdout_path ].each do |var|
         String === (path = set[var]) or next
         path = File.expand_path(path)
-        test(?w, path) || test(?w, File.dirname(path)) or \
+        File.writable?(path) || File.writable?(File.dirname(path)) or \
               raise ArgumentError, "directory for #{var}=#{path} not writable"
       end
 
@@ -77,9 +79,13 @@ module Unicorn
 
     # sets object to the +new+ Logger-like object.  The new logger-like
     # object must respond to the following methods:
-    #  +debug+, +info+, +warn+, +error+, +fatal+, +close+
+    #  +debug+, +info+, +warn+, +error+, +fatal+
+    # The default Logger will log its output to the path specified
+    # by +stderr_path+.  If you're running Unicorn daemonized, then
+    # you must specify a path to prevent error messages from going
+    # to /dev/null.
     def logger(new)
-      %w(debug info warn error fatal close).each do |m|
+      %w(debug info warn error fatal).each do |m|
         new.respond_to?(m) and next
         raise ArgumentError, "logger=#{new} does not respond to method=#{m}"
       end
@@ -310,11 +316,19 @@ module Unicorn
     # file will be opened with the File::APPEND flag and writes
     # synchronized to the kernel (but not necessarily to _disk_) so
     # multiple processes can safely append to it.
+    #
+    # If you are daemonizing and using the default +logger+, it is important
+    # to specify this as errors will otherwise be lost to /dev/null.
+    # Some applications/libraries may also triggering warnings that go to
+    # stderr, and they will end up here.
     def stderr_path(path)
       set_path(:stderr_path, path)
     end
 
-    # Same as stderr_path, except for $stdout
+    # Same as stderr_path, except for $stdout.  Not many Rack applications
+    # write to $stdout, but any that do will have their output written here.
+    # It is safe to point this to the same location a stderr_path.
+    # Like stderr_path, this defaults to /dev/null when daemonized.
     def stdout_path(path)
       set_path(:stdout_path, path)
     end
@@ -327,7 +341,7 @@ module Unicorn
       path = File.expand_path(path)
       if config_file &&
          config_file[0] != ?/ &&
-         ! test(?r, "#{path}/#{config_file}")
+         ! File.readable?("#{path}/#{config_file}")
         raise ArgumentError,
               "config_file=#{config_file} would not be accessible in" \
               " working_directory=#{path}"

data/lib/unicorn/const.rb

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

data/lib/unicorn/oob_gc.rb

@@ -0,0 +1,58 @@
+# -*- encoding: binary -*-
+module Unicorn
+
+  # Run GC after every request, after closing the client socket and
+  # before attempting to accept more connections.
+  #
+  # This shouldn't hurt overall performance as long as the server cluster
+  # is at <50% CPU capacity, and improves the performance of most memory
+  # intensive requests.  This serves to improve _client-visible_
+  # performance (possibly at the cost of overall performance).
+  #
+  # We'll call GC after each request is been written out to the socket, so
+  # the client never sees the extra GC hit it.
+  #
+  # This middleware is _only_ effective for applications that use a lot
+  # of memory, and will hurt simpler apps/endpoints that can process
+  # multiple requests before incurring GC.
+  #
+  # This middleware is only designed to work with Unicorn, as it harms
+  # keepalive performance.
+  #
+  # Example (in config.ru):
+  #
+  #     require 'unicorn/oob_gc'
+  #
+  #     # GC ever two requests that hit /expensive/foo or /more_expensive/foo
+  #     # in your app.  By default, this will GC once every 5 requests
+  #     # for all endpoints in your app
+  #     use Unicorn::OobGC, 2, %r{\A/(?:expensive/foo|more_expensive/foo)}
+  class OobGC < Struct.new(:app, :interval, :path, :nr, :env, :body)
+
+    def initialize(app, interval = 5, path = %r{\A/})
+      super(app, interval, path, interval)
+    end
+
+    def call(env)
+      status, headers, self.body = app.call(self.env = env)
+      [ status, headers, self ]
+    end
+
+    def each(&block)
+      body.each(&block)
+    end
+
+    # in Unicorn, this is closed _after_ the client socket
+    def close
+      body.close if body.respond_to?(:close)
+
+      if path =~ env['PATH_INFO'] && ((self.nr -= 1) <= 0)
+        self.nr = interval
+        self.body = nil
+        env.clear
+        GC.start
+      end
+    end
+
+  end
+end

data/lib/unicorn/util.rb

@@ -22,6 +22,7 @@ module Unicorn
 
         ! fp.closed? &&
           fp.sync &&
+          fp.path &&
           fp.path[0] == ?/ &&
           (fp.fcntl(Fcntl::F_GETFL) & append_flags) == append_flags
       end
@@ -41,10 +42,11 @@ module Unicorn
       #   4) unbuffered (as far as userspace buffering goes, not O_SYNC)
       # Returns the number of files reopened
       def reopen_logs
+        to_reopen = []
         nr = 0
+        ObjectSpace.each_object(File) { |fp| is_log?(fp) and to_reopen << fp }
 
-        ObjectSpace.each_object(File) do |fp|
-          is_log?(fp) or next
+        to_reopen.each do |fp|
           orig_st = fp.stat
           begin
             b = File.stat(fp.path)
@@ -52,19 +54,15 @@ module Unicorn
           rescue Errno::ENOENT
           end
 
-          open_arg = 'a'
-          if fp.respond_to?(:external_encoding) && enc = fp.external_encoding
-            open_arg << ":#{enc.to_s}"
-            enc = fp.internal_encoding and open_arg << ":#{enc.to_s}"
-          end
-          fp.reopen(fp.path, open_arg)
+          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)
           end
           nr += 1
-        end # each_object
+        end
+
         nr
       end
 

data/local.mk.sample

@@ -5,22 +5,34 @@
 # This is depends on a bunch of GNU-isms from bash, sed, touch.
 
 DLEXT := so
-gems := rack-1.1.0
 
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.
 prefix = $(HOME)
-ifeq ($(r19),)
-  RUBY := $(prefix)/bin/ruby
-  gem_paths := $(addprefix $(prefix)/lib/ruby/gems/1.8/gems/,$(gems))
+ifeq ($(r192),)
+  ifeq ($(r19),)
+    ifeq ($(rbx),)
+      RUBY := $(prefix)/bin/ruby
+    else
+      prefix := $(prefix)/rbx
+      export PATH := $(prefix)/bin:$(PATH)
+      RUBY := $(prefix)/bin/rbx
+    endif
+  else
+    prefix := $(prefix)/ruby-1.9
+    export PATH := $(prefix)/bin:$(PATH)
+    RUBY := $(prefix)/bin/ruby --disable-gems
+  endif
 else
-  prefix := $(prefix)/ruby-1.9
+  prefix := $(prefix)/ruby-1.9.2
   export PATH := $(prefix)/bin:$(PATH)
   RUBY := $(prefix)/bin/ruby --disable-gems
-  gem_paths := $(addprefix $(prefix)/lib/ruby/gems/1.9.1/gems/,$(gems))
 endif
 
-ifdef gem_paths
+# FIXME: use isolate more
+ifndef RUBYLIB
+  gems := rack-1.1.0
+  gem_paths := $(addprefix $(HOME)/lib/ruby/gems/1.8/gems/,$(gems))
   sp :=
   sp +=
   export RUBYLIB := $(subst $(sp),:,$(addsuffix /lib,$(gem_paths)))
@@ -30,33 +42,17 @@ endif
 # SHELL := /bin/bash -e -o pipefail
 SHELL := /bin/ksh93 -e -o pipefail
 
-full-test: test-18 test-19
-test-18:
-	$(MAKE) test test-rails 2>&1 | sed -e 's!^!1.8 !'
-test-19:
-	$(MAKE) test test-rails r19=1 2>&1 | sed -e 's!^!1.9 !'
-
-latest: NEWS
-	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' < $<
+full-test: test-18 test-191 test-192 test-rbx
 
-# publishes docs to http://unicorn.bogomips.org
-publish_doc:
-	-git set-file-times
-	$(RM) -r doc ChangeLog NEWS
-	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
-	$(MAKE) -s latest > doc/LATEST
-	find doc/images doc/js -type f | \
-		TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css
-	$(MAKE) doc_gz
-	tar cf - $$(git ls-files examples/) | (cd doc && tar xf -)
-	chmod 644 $$(find doc -type f)
-	rsync -av doc/ dcvr:/srv/unicorn/
-	git ls-files | xargs touch
-
-# Create gzip variants of the same timestamp as the original so nginx
-# "gzip_static on" can serve the gzipped versions directly.
-doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
-doc_gz:
-	touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)"
-	for i in $(docs); do \
-	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+# FIXME: keep eye on Rubinius activity and wait for fixes from upstream
+# so we don't need RBX_SKIP anymore
+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-18:
+	$(MAKE) test-all 2>&1 |sed 's!^!1.8 !'
+test-191:
+	$(MAKE) test-all r19=1 2>&1 |sed 's!^!1.9.1 !'
+test-192:
+	$(MAKE) test-all r192=1 2>&1 |sed 's!^!1.9.2 !'

data/t/GNUmakefile

@@ -4,6 +4,7 @@ all::
 pid := $(shell echo $$PPID)
 
 RUBY = ruby
+RAKE = rake
 -include ../local.mk
 ifeq ($(RUBY_VERSION),)
   RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
@@ -13,12 +14,15 @@ ifeq ($(RUBY_VERSION),)
   $(error unable to detect RUBY_VERSION)
 endif
 
+RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
+export RUBY_ENGINE
+
 T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
 
 all:: $(T)
 
 # can't rely on "set -o pipefail" since we don't require bash or ksh93 :<
-t_pfx = trash/$@-$(RUBY_VERSION)
+t_pfx = trash/$@-$(RUBY_ENGINE)-$(RUBY_VERSION)
 TEST_OPTS =
 # TRACER = strace -f -o $(t_pfx).strace -s 100000
 # TRACER = /usr/bin/time -o $(t_pfx).time
@@ -47,11 +51,12 @@ $(deps):
 	@mv $@.$(pid) $@
 dep: $(deps)
 
-test_prefix := $(CURDIR)/../test/install-$(RUBY_VERSION)
+test_prefix := $(CURDIR)/../test/$(RUBY_ENGINE)-$(RUBY_VERSION)
 $(test_prefix)/.stamp:
 	$(MAKE) -C .. test-install
 
 $(T): export RUBY := $(RUBY)
+$(T): export RAKE := $(RAKE)
 $(T): export PATH := $(test_prefix)/bin:$(PATH)
 $(T): export RUBYLIB := $(test_prefix)/lib:$(RUBYLIB)
 $(T): dep $(test_prefix)/.stamp trash/.gitignore

data/t/rails3-app/.gitignore

@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*

data/t/rails3-app/Gemfile

@@ -0,0 +1,26 @@
+source 'http://rubygems.org'
+
+# gem 'rails', '3.0.0.beta3'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri', '1.4.1'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
+# Bundle gems for certain environments:
+# gem 'rspec', :group => :test
+# group :test do
+#   gem 'webrat'
+# end