unicorn 1.0.2 → 1.1.0

data/Documentation/unicorn.1.txt

@@ -36,6 +36,9 @@ with rackup(1) but strongly discouraged.
     implemented as a Ruby DSL, so Ruby code may executed.
     See the RDoc/ri for the *Unicorn::Configurator* class for the full
     list of directives available from the DSL.
+    Using an absolute path for for CONFIG_FILE is recommended as it
+    makes multiple instances of Unicorn easily distinguishable when
+    viewing ps(1) output.
 
 -D, \--daemonize
 :   Run daemonized in the background.  The process is detached from

data/Documentation/unicorn_rails.1.txt

@@ -34,8 +34,11 @@ as much as possible.
 -c, \--config-file CONFIG_FILE
 :   Path to the Unicorn-specific config file.  The config file is
     implemented as a Ruby DSL, so Ruby code may executed.
-    See the RDoc/ri for the *Unicorn::Configurator* class for the
-    full list of directives available from the DSL.
+    See the RDoc/ri for the *Unicorn::Configurator* class for the full
+    list of directives available from the DSL.
+    Using an absolute path for for CONFIG_FILE is recommended as it
+    makes multiple instances of Unicorn easily distinguishable when
+    viewing ps(1) output.
 
 -D, \--daemonize
 :   Run daemonized in the background.  The process is detached from

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -169,7 +169,7 @@ NEWS: GIT-VERSION-FILE .manifest
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE = 1.0.0
+SINCE = 0.991.0
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)
@@ -189,7 +189,7 @@ atom = <link rel="alternate" title="Atom feed" href="$(1)" \
 doc: .document $(ext)/unicorn_http.c NEWS ChangeLog
 	for i in $(man1_rdoc); do echo > $$i; done
 	find bin lib -type f -name '*.rbc' -exec rm -f '{}' ';'
-	rdoc -t "$(shell sed -ne '1s/^= //p' README)"
+	rdoc -a -t "$(shell sed -ne '1s/^= //p' README)"
 	install -m644 COPYING doc/COPYING
 	install -m644 $(shell grep '^[A-Z]' .document)  doc/
 	$(MAKE) -C Documentation install-html install-man

data/Rakefile

@@ -15,7 +15,7 @@ def tags
   timefmt = '%Y-%m-%dT%H:%M:%SZ'
   @tags ||= `git tag -l`.split(/\n/).map do |tag|
     next if tag == "v0.0.0"
-    if %r{\Av[\d\.]+} =~ tag
+    if %r{\Av[\d\.]+\z} =~ tag
       header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
       header = header.split(/\n/)
       tagger = header.grep(/\Atagger /).first
@@ -168,12 +168,8 @@ task :fm_update do
       "changelog" => changelog,
     },
   }.to_json
-  if ! changelog.strip.empty? && version =~ %r{\A[\d\.]+\d+\z}
-    Net::HTTP.start(uri.host, uri.port) do |http|
-      p http.post(uri.path, req, {'Content-Type'=>'application/json'})
-    end
-  else
-    warn "not updating freshmeat for v#{version}"
+  Net::HTTP.start(uri.host, uri.port) do |http|
+    p http.post(uri.path, req, {'Content-Type'=>'application/json'})
   end
 end
 

data/ext/unicorn_http/unicorn_http.rl

@@ -684,7 +684,7 @@ void Init_unicorn_http(void)
 {
   VALUE mUnicorn, cHttpParser;
 
-  mUnicorn = rb_define_module("Unicorn");
+  mUnicorn = rb_const_get(rb_cObject, rb_intern("Unicorn"));
   cHttpParser = rb_define_class_under(mUnicorn, "HttpParser", rb_cObject);
   eHttpParserError =
          rb_define_class_under(mUnicorn, "HttpParserError", rb_eIOError);

data/lib/unicorn.rb

@@ -2,6 +2,7 @@
 
 require 'fcntl'
 require 'etc'
+require 'stringio'
 require 'rack'
 require 'unicorn/socket_helper'
 require 'unicorn/const'
@@ -312,11 +313,6 @@ module Unicorn
       if path
         if x = valid_pid?(path)
           return path if pid && path == pid && x == $$
-          if x == reexec_pid && pid =~ /\.oldbin\z/
-            logger.warn("will not set pid=#{path} while reexec-ed "\
-                        "child is running PID:#{x}")
-            return
-          end
           raise ArgumentError, "Already running on PID:#{x} " \
                                "(or pid=#{path} is stale)"
         end
@@ -422,12 +418,10 @@ 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
@@ -488,14 +482,17 @@ module Unicorn
     # wait for a signal hander to wake us up and then consume the pipe
     # Wake up every second anyways to run murder_lazy_workers
     def master_sleep(sec)
-      IO.select([ SELF_PIPE[0] ], nil, nil, sec) or return
-      SELF_PIPE[0].read_nonblock(Const::CHUNK_SIZE, HttpRequest::BUF)
+      begin
+        IO.select([ SELF_PIPE[0] ], nil, nil, sec) or return
+        SELF_PIPE[0].read_nonblock(Const::CHUNK_SIZE, HttpRequest::BUF)
       rescue Errno::EAGAIN, Errno::EINTR
+        break
+      end while true
     end
 
     def awaken_master
       begin
-        SELF_PIPE.last.write_nonblock('.') # wakeup master process from select
+        SELF_PIPE[1].write_nonblock('.') # wakeup master process from select
       rescue Errno::EAGAIN, Errno::EINTR
         # pipe is full, master should wake up anyways
         retry
@@ -639,7 +636,7 @@ module Unicorn
       client.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
       response = app.call(env = REQUEST.read(client))
 
-      if 100 == response.first.to_i
+      if 100 == response[0].to_i
         client.write(Const::EXPECT_100_RESPONSE)
         env.delete(Const::HTTP_EXPECT)
         response = app.call(env)
@@ -688,7 +685,7 @@ module Unicorn
       ready = LISTENERS
 
       # closing anything we IO.select on will raise EBADF
-      trap(:USR1) { nr = -65536; SELF_PIPE.first.close rescue nil }
+      trap(:USR1) { nr = -65536; SELF_PIPE[0].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"
@@ -729,7 +726,7 @@ module Unicorn
         begin
           # timeout used so we can detect parent death:
           ret = IO.select(LISTENERS, nil, SELF_PIPE, timeout) or redo
-          ready = ret.first
+          ready = ret[0]
         rescue Errno::EINTR
           ready = LISTENERS
         rescue Errno::EBADF

data/lib/unicorn/configurator.rb

@@ -1,489 +1,512 @@
 # -*- encoding: binary -*-
-
-require 'socket'
 require 'logger'
 
-module Unicorn
-
-  # Implements a simple DSL for configuring a Unicorn server.
-  #
-  # 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)
-    # :stopdoc:
-    # used to stash stuff for deferred processing of cli options in
-    # config.ru after "working_directory" is bound.  Do not rely on
-    # this being around later on...
-    RACKUP = {}
-    # :startdoc:
-
-    # Default settings for Unicorn
-    DEFAULTS = {
-      :timeout => 60,
-      :logger => Logger.new($stderr),
-      :worker_processes => 1,
-      :after_fork => lambda { |server, worker|
-          server.logger.info("worker=#{worker.nr} spawned pid=#{$$}")
-        },
-      :before_fork => lambda { |server, worker|
-          server.logger.info("worker=#{worker.nr} spawning...")
-        },
-      :before_exec => lambda { |server|
-          server.logger.info("forked child re-executing...")
-        },
-      :pid => nil,
-      :preload_app => false,
-    }
-
-    def initialize(defaults = {}) #:nodoc:
-      self.set = Hash.new(:unset)
-      @use_defaults = defaults.delete(:use_defaults)
-      self.config_file = defaults.delete(:config_file)
-
-      # after_reload is only used by unicorn_rails, unsupported otherwise
-      self.after_reload = defaults.delete(:after_reload)
-
-      set.merge!(DEFAULTS) if @use_defaults
-      defaults.each { |key, value| self.__send__(key, value) }
-      Hash === set[:listener_opts] or
-          set[:listener_opts] = Hash.new { |hash,key| hash[key] = {} }
-      Array === set[:listeners] or set[:listeners] = []
-      reload(false)
-    end
+# Implements a simple DSL for configuring a \Unicorn server.
+#
+# 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 Unicorn::Configurator < Struct.new(:set, :config_file, :after_reload)
+  # used to stash stuff for deferred processing of cli options in
+  # config.ru after "working_directory" is bound.  Do not rely on
+  # this being around later on...
+  RACKUP = {} # :nodoc:
+
+  # Default settings for Unicorn
+  # :stopdoc:
+  DEFAULTS = {
+    :timeout => 60,
+    :logger => Logger.new($stderr),
+    :worker_processes => 1,
+    :after_fork => lambda { |server, worker|
+        server.logger.info("worker=#{worker.nr} spawned pid=#{$$}")
+      },
+    :before_fork => lambda { |server, worker|
+        server.logger.info("worker=#{worker.nr} spawning...")
+      },
+    :before_exec => lambda { |server|
+        server.logger.info("forked child re-executing...")
+      },
+    :pid => nil,
+    :preload_app => false,
+  }
+  #:startdoc:
+
+  def initialize(defaults = {}) #:nodoc:
+    self.set = Hash.new(:unset)
+    use_defaults = defaults.delete(:use_defaults)
+    self.config_file = defaults.delete(:config_file)
+
+    # after_reload is only used by unicorn_rails, unsupported otherwise
+    self.after_reload = defaults.delete(:after_reload)
+
+    set.merge!(DEFAULTS) if use_defaults
+    defaults.each { |key, value| self.send(key, value) }
+    Hash === set[:listener_opts] or
+        set[:listener_opts] = Hash.new { |hash,key| hash[key] = {} }
+    Array === set[:listeners] or set[:listeners] = []
+    reload
+  end
 
-    def reload(merge_defaults = true) #:nodoc:
-      if merge_defaults && @use_defaults
-        set.merge!(DEFAULTS) if @use_defaults
-      end
-      instance_eval(File.read(config_file), config_file) if config_file
+  def reload #:nodoc:
+    instance_eval(File.read(config_file), config_file) if config_file
 
-      parse_rackup_file
+    parse_rackup_file
 
-      # unicorn_rails creates dirs here after working_directory is bound
-      after_reload.call if after_reload
+    # unicorn_rails creates dirs here after working_directory is bound
+    after_reload.call if after_reload
 
-      # working_directory binds immediately (easier error checking that way),
-      # now ensure any paths we changed are correctly set.
-      [ :pid, :stderr_path, :stdout_path ].each do |var|
-        String === (path = set[var]) or next
-        path = File.expand_path(path)
-        File.writable?(path) || File.writable?(File.dirname(path)) or \
-              raise ArgumentError, "directory for #{var}=#{path} not writable"
-      end
+    # working_directory binds immediately (easier error checking that way),
+    # now ensure any paths we changed are correctly set.
+    [ :pid, :stderr_path, :stdout_path ].each do |var|
+      String === (path = set[var]) or next
+      path = File.expand_path(path)
+      File.writable?(path) || File.writable?(File.dirname(path)) or \
+            raise ArgumentError, "directory for #{var}=#{path} not writable"
     end
+  end
 
-    def commit!(server, options = {}) #:nodoc:
-      skip = options[:skip] || []
-      if ready_pipe = RACKUP.delete(:ready_pipe)
-        server.ready_pipe = ready_pipe
-      end
-      set.each do |key, value|
-        value == :unset and next
-        skip.include?(key) and next
-        server.__send__("#{key}=", value)
-      end
+  def commit!(server, options = {}) #:nodoc:
+    skip = options[:skip] || []
+    if ready_pipe = RACKUP.delete(:ready_pipe)
+      server.ready_pipe = ready_pipe
     end
-
-    def [](key) # :nodoc:
-      set[key]
+    set.each do |key, value|
+      value == :unset and next
+      skip.include?(key) and next
+      server.__send__("#{key}=", value)
     end
+  end
 
-    # sets object to the +new+ Logger-like object.  The new logger-like
-    # object must respond to the following methods:
-    #  +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).each do |m|
-        new.respond_to?(m) and next
-        raise ArgumentError, "logger=#{new} does not respond to method=#{m}"
-      end
+  def [](key) # :nodoc:
+    set[key]
+  end
 
-      set[:logger] = new
+  # sets object to the +new+ Logger-like object.  The new logger-like
+  # object must respond to the following methods:
+  #  +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).each do |m|
+      new.respond_to?(m) and next
+      raise ArgumentError, "logger=#{new} does not respond to method=#{m}"
     end
 
-    # sets after_fork hook to a given block.  This block will be called by
-    # the worker after forking.  The following is an example hook which adds
-    # a per-process listener to every worker:
-    #
-    #  after_fork do |server,worker|
-    #    # per-process listener ports for debugging/admin:
-    #    addr = "127.0.0.1:#{9293 + worker.nr}"
-    #
-    #    # the negative :tries parameter indicates we will retry forever
-    #    # waiting on the existing process to exit with a 5 second :delay
-    #    # Existing options for Unicorn::Configurator#listen such as
-    #    # :backlog, :rcvbuf, :sndbuf are available here as well.
-    #    server.listen(addr, :tries => -1, :delay => 5, :backlog => 128)
-    #
-    #    # drop permissions to "www-data" in the worker
-    #    # generally there's no reason to start Unicorn as a priviledged user
-    #    # as it is not recommended to expose Unicorn to public clients.
-    #    worker.user('www-data', 'www-data') if Process.euid == 0
-    #  end
-    def after_fork(*args, &block)
-      set_hook(:after_fork, block_given? ? block : args[0])
-    end
+    set[:logger] = new
+  end
 
-    # sets before_fork got be a given Proc object.  This Proc
-    # object will be called by the master process before forking
-    # each worker.
-    def before_fork(*args, &block)
-      set_hook(:before_fork, block_given? ? block : args[0])
-    end
+  # sets after_fork hook to a given block.  This block will be called by
+  # the worker after forking.  The following is an example hook which adds
+  # a per-process listener to every worker:
+  #
+  #  after_fork do |server,worker|
+  #    # per-process listener ports for debugging/admin:
+  #    addr = "127.0.0.1:#{9293 + worker.nr}"
+  #
+  #    # the negative :tries parameter indicates we will retry forever
+  #    # waiting on the existing process to exit with a 5 second :delay
+  #    # Existing options for Unicorn::Configurator#listen such as
+  #    # :backlog, :rcvbuf, :sndbuf are available here as well.
+  #    server.listen(addr, :tries => -1, :delay => 5, :backlog => 128)
+  #
+  #    # drop permissions to "www-data" in the worker
+  #    # generally there's no reason to start Unicorn as a priviledged user
+  #    # as it is not recommended to expose Unicorn to public clients.
+  #    worker.user('www-data', 'www-data') if Process.euid == 0
+  #  end
+  def after_fork(*args, &block)
+    set_hook(:after_fork, block_given? ? block : args[0])
+  end
 
-    # sets the before_exec hook to a given Proc object.  This
-    # Proc object will be called by the master process right
-    # before exec()-ing the new unicorn binary.  This is useful
-    # for freeing certain OS resources that you do NOT wish to
-    # share with the reexeced child process.
-    # There is no corresponding after_exec hook (for obvious reasons).
-    def before_exec(*args, &block)
-      set_hook(:before_exec, block_given? ? block : args[0], 1)
-    end
+  # sets before_fork got be a given Proc object.  This Proc
+  # object will be called by the master process before forking
+  # each worker.
+  def before_fork(*args, &block)
+    set_hook(:before_fork, block_given? ? block : args[0])
+  end
 
-    # sets the timeout of worker processes to +seconds+.  Workers
-    # handling the request/app.call/response cycle taking longer than
-    # this time period will be forcibly killed (via SIGKILL).  This
-    # timeout is enforced by the master process itself and not subject
-    # 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}"
-      seconds >= 3 or raise ArgumentError,
-                                  "too low: timeout=#{seconds.inspect}"
-      set[:timeout] = seconds
-    end
+  # sets the before_exec hook to a given Proc object.  This
+  # Proc object will be called by the master process right
+  # before exec()-ing the new unicorn binary.  This is useful
+  # for freeing certain OS resources that you do NOT wish to
+  # share with the reexeced child process.
+  # There is no corresponding after_exec hook (for obvious reasons).
+  def before_exec(*args, &block)
+    set_hook(:before_exec, block_given? ? block : args[0], 1)
+  end
 
-    # sets the current number of worker_processes to +nr+.  Each worker
-    # process will serve exactly one client at a time.  You can
-    # increment or decrement this value at runtime by sending SIGTTIN
-    # or SIGTTOU respectively to the master process without reloading
-    # the rest of your Unicorn configuration.  See the SIGNALS document
-    # for more information.
-    def worker_processes(nr)
-      Integer === nr or raise ArgumentError,
-                             "not an integer: worker_processes=#{nr.inspect}"
-      nr >= 0 or raise ArgumentError,
-                             "not non-negative: worker_processes=#{nr.inspect}"
-      set[:worker_processes] = nr
-    end
+  # sets the timeout of worker processes to +seconds+.  Workers
+  # handling the request/app.call/response cycle taking longer than
+  # this time period will be forcibly killed (via SIGKILL).  This
+  # timeout is enforced by the master process itself and not subject
+  # 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}"
+    seconds >= 3 or raise ArgumentError,
+                                "too low: timeout=#{seconds.inspect}"
+    set[:timeout] = seconds
+  end
 
-    # sets listeners to the given +addresses+, replacing or augmenting the
-    # current set.  This is for the global listener pool shared by all
-    # worker processes.  For per-worker listeners, see the after_fork example
-    # This is for internal API use only, do not use it in your Unicorn
-    # config file.  Use listen instead.
-    def listeners(addresses) # :nodoc:
-      Array === addresses or addresses = Array(addresses)
-      addresses.map! { |addr| expand_addr(addr) }
-      set[:listeners] = addresses
-    end
+  # sets the current number of worker_processes to +nr+.  Each worker
+  # process will serve exactly one client at a time.  You can
+  # increment or decrement this value at runtime by sending SIGTTIN
+  # or SIGTTOU respectively to the master process without reloading
+  # the rest of your Unicorn configuration.  See the SIGNALS document
+  # for more information.
+  def worker_processes(nr)
+    Integer === nr or raise ArgumentError,
+                           "not an integer: worker_processes=#{nr.inspect}"
+    nr >= 0 or raise ArgumentError,
+                           "not non-negative: worker_processes=#{nr.inspect}"
+    set[:worker_processes] = nr
+  end
 
-    # adds an +address+ to the existing listener set.
-    #
-    # The following options may be specified (but are generally not needed):
-    #
-    # +:backlog+: this is the backlog of the listen() syscall.
-    #
-    # Some operating systems allow negative values here to specify the
-    # maximum allowable value.  In most cases, this number is only
-    # recommendation and there are other OS-specific tunables and
-    # variables that can affect this number.  See the listen(2)
-    # syscall documentation of your OS for the exact semantics of
-    # this.
-    #
-    # If you are running unicorn on multiple machines, lowering this number
-    # can help your load balancer detect when a machine is overloaded
-    # and give requests to a different machine.
-    #
-    # Default: 1024
-    #
-    # +:rcvbuf+, +:sndbuf+: maximum receive and send buffer sizes of sockets
-    #
-    # These correspond to the SO_RCVBUF and SO_SNDBUF settings which
-    # can be set via the setsockopt(2) syscall.  Some kernels
-    # (e.g. Linux 2.4+) have intelligent auto-tuning mechanisms and
-    # there is no need (and it is sometimes detrimental) to specify them.
-    #
-    # See the socket API documentation of your operating system
-    # to determine the exact semantics of these settings and
-    # other operating system-specific knobs where they can be
-    # specified.
-    #
-    # Defaults: operating system defaults
-    #
-    # +:tcp_nodelay+: disables Nagle's algorithm on TCP sockets
-    #
-    # This has no effect on UNIX sockets.
-    #
-    # Default: operating system defaults (usually Nagle's algorithm enabled)
-    #
-    # +:tcp_nopush+: enables TCP_CORK in Linux or TCP_NOPUSH in FreeBSD
-    #
-    # This will prevent partial TCP frames from being sent out.
-    # Enabling +tcp_nopush+ is generally not needed or recommended as
-    # controlling +tcp_nodelay+ already provides sufficient latency
-    # reduction whereas Unicorn does not know when the best times are
-    # for flushing corked sockets.
-    #
-    # This has no effect on UNIX sockets.
-    #
-    # +:tries+: times to retry binding a socket if it is already in use
-    #
-    # A negative number indicates we will retry indefinitely, this is
-    # useful for migrations and upgrades when individual workers
-    # are binding to different ports.
-    #
-    # Default: 5
-    #
-    # +:delay+: seconds to wait between successive +tries+
-    #
-    # Default: 0.5 seconds
-    #
-    # +:umask+: sets the file mode creation mask for UNIX sockets
-    #
-    # Typically UNIX domain sockets are created with more liberal
-    # file permissions than the rest of the application.  By default,
-    # we create UNIX domain sockets to be readable and writable by
-    # all local users to give them the same accessibility as
-    # locally-bound TCP listeners.
-    #
-    # This has no effect on TCP listeners.
-    #
-    # Default: 0 (world read/writable)
-    def listen(address, opt = {})
-      address = expand_addr(address)
-      if String === address
-        [ :umask, :backlog, :sndbuf, :rcvbuf, :tries ].each do |key|
-          value = opt[key] or next
-          Integer === value or
-            raise ArgumentError, "not an integer: #{key}=#{value.inspect}"
-        end
-        [ :tcp_nodelay, :tcp_nopush ].each do |key|
-          (value = opt[key]).nil? and next
-          TrueClass === value || FalseClass === value or
-            raise ArgumentError, "not boolean: #{key}=#{value.inspect}"
-        end
-        unless (value = opt[:delay]).nil?
-          Numeric === value or
-            raise ArgumentError, "not numeric: delay=#{value.inspect}"
-        end
-        set[:listener_opts][address].merge!(opt)
+  # sets listeners to the given +addresses+, replacing or augmenting the
+  # current set.  This is for the global listener pool shared by all
+  # worker processes.  For per-worker listeners, see the after_fork example
+  # This is for internal API use only, do not use it in your Unicorn
+  # config file.  Use listen instead.
+  def listeners(addresses) # :nodoc:
+    Array === addresses or addresses = Array(addresses)
+    addresses.map! { |addr| expand_addr(addr) }
+    set[:listeners] = addresses
+  end
+
+  # adds an +address+ to the existing listener set.
+  #
+  # The following options may be specified (but are generally not needed):
+  #
+  # +:backlog+: this is the backlog of the listen() syscall.
+  #
+  # Some operating systems allow negative values here to specify the
+  # maximum allowable value.  In most cases, this number is only
+  # recommendation and there are other OS-specific tunables and
+  # variables that can affect this number.  See the listen(2)
+  # syscall documentation of your OS for the exact semantics of
+  # this.
+  #
+  # If you are running unicorn on multiple machines, lowering this number
+  # can help your load balancer detect when a machine is overloaded
+  # and give requests to a different machine.
+  #
+  # Default: 1024
+  #
+  # +:rcvbuf+, +:sndbuf+: maximum receive and send buffer sizes of sockets
+  #
+  # These correspond to the SO_RCVBUF and SO_SNDBUF settings which
+  # can be set via the setsockopt(2) syscall.  Some kernels
+  # (e.g. Linux 2.4+) have intelligent auto-tuning mechanisms and
+  # there is no need (and it is sometimes detrimental) to specify them.
+  #
+  # See the socket API documentation of your operating system
+  # to determine the exact semantics of these settings and
+  # other operating system-specific knobs where they can be
+  # specified.
+  #
+  # Defaults: operating system defaults
+  #
+  # +:tcp_nodelay+: disables Nagle's algorithm on TCP sockets
+  #
+  # This has no effect on UNIX sockets.
+  #
+  # Default: operating system defaults (usually Nagle's algorithm enabled)
+  #
+  # +:tcp_nopush+: enables TCP_CORK in Linux or TCP_NOPUSH in FreeBSD
+  #
+  # This will prevent partial TCP frames from being sent out.
+  # Enabling +tcp_nopush+ is generally not needed or recommended as
+  # controlling +tcp_nodelay+ already provides sufficient latency
+  # reduction whereas Unicorn does not know when the best times are
+  # for flushing corked sockets.
+  #
+  # This has no effect on UNIX sockets.
+  #
+  # +:tries+: times to retry binding a socket if it is already in use
+  #
+  # A negative number indicates we will retry indefinitely, this is
+  # useful for migrations and upgrades when individual workers
+  # are binding to different ports.
+  #
+  # Default: 5
+  #
+  # +:delay+: seconds to wait between successive +tries+
+  #
+  # Default: 0.5 seconds
+  #
+  # +:umask+: sets the file mode creation mask for UNIX sockets
+  #
+  # Typically UNIX domain sockets are created with more liberal
+  # file permissions than the rest of the application.  By default,
+  # we create UNIX domain sockets to be readable and writable by
+  # all local users to give them the same accessibility as
+  # locally-bound TCP listeners.
+  #
+  # This has no effect on TCP listeners.
+  #
+  # Default: 0 (world read/writable)
+  #
+  # +:tcp_defer_accept:+ defer accept() until data is ready (Linux-only)
+  #
+  # For Linux 2.6.32 and later, this is the number of retransmits to
+  # defer an accept() for if no data arrives, but the client will
+  # eventually be accepted after the specified number of retransmits
+  # regardless of whether data is ready.
+  #
+  # For Linux before 2.6.32, this is a boolean option, and
+  # accepts are _always_ deferred indefinitely if no data arrives.
+  # This is similar to <code>:accept_filter => "dataready"</code>
+  # under FreeBSD.
+  #
+  # Specifying +true+ is synonymous for the default value(s) below,
+  # and +false+ or +nil+ is synonymous for a value of zero.
+  #
+  # A value of +1+ is a good optimization for local networks
+  # and trusted clients.  For Rainbows! and Zbatery users, a higher
+  # value (e.g. +60+) provides more protection against some
+  # denial-of-service attacks.  There is no good reason to ever
+  # disable this with a +zero+ value when serving HTTP.
+  #
+  # Default: 1 retransmit for \Unicorn, 60 for Rainbows! 0.95.0\+
+  #
+  # +:accept_filter: defer accept() until data is ready (FreeBSD-only)
+  #
+  # This enables either the "dataready" or (default) "httpready"
+  # accept() filter under FreeBSD.  This is intended as an
+  # optimization to reduce context switches with common GET/HEAD
+  # requests.  For Rainbows! and Zbatery users, this provides
+  # some protection against certain denial-of-service attacks, too.
+  #
+  # There is no good reason to change from the default.
+  #
+  # Default: "httpready"
+  def listen(address, opt = {})
+    address = expand_addr(address)
+    if String === address
+      [ :umask, :backlog, :sndbuf, :rcvbuf, :tries ].each do |key|
+        value = opt[key] or next
+        Integer === value or
+          raise ArgumentError, "not an integer: #{key}=#{value.inspect}"
+      end
+      [ :tcp_nodelay, :tcp_nopush ].each do |key|
+        (value = opt[key]).nil? and next
+        TrueClass === value || FalseClass === value or
+          raise ArgumentError, "not boolean: #{key}=#{value.inspect}"
+      end
+      unless (value = opt[:delay]).nil?
+        Numeric === value or
+          raise ArgumentError, "not numeric: delay=#{value.inspect}"
       end
+      set[:listener_opts][address].merge!(opt)
+    end
+
+    set[:listeners] << address
+  end
 
-      set[:listeners] << address
+  # sets the +path+ for the PID file of the unicorn master process
+  def pid(path); set_path(:pid, path); end
+
+  # Enabling this preloads an application before forking worker
+  # processes.  This allows memory savings when using a
+  # copy-on-write-friendly GC but can cause bad things to happen when
+  # resources like sockets are opened at load time by the master
+  # process and shared by multiple children.  People enabling this are
+  # highly encouraged to look at the before_fork/after_fork hooks to
+  # properly close/reopen sockets.  Files opened for logging do not
+  # have to be reopened as (unbuffered-in-userspace) files opened with
+  # the File::APPEND flag are written to atomically on UNIX.
+  #
+  # In addition to reloading the unicorn-specific config settings,
+  # SIGHUP will reload application code in the working
+  # directory/symlink when workers are gracefully restarted when
+  # preload_app=false (the default).  As reloading the application
+  # sometimes requires RubyGems updates, +Gem.refresh+ is always
+  # called before the application is loaded (for RubyGems users).
+  #
+  # During deployments, care should _always_ be taken to ensure your
+  # applications are properly deployed and running.  Using
+  # preload_app=false (the default) means you _must_ check if
+  # your application is responding properly after a deployment.
+  # Improperly deployed applications can go into a spawn loop
+  # if the application fails to load.  While your children are
+  # in a spawn loop, it is is possible to fix an application
+  # by properly deploying all required code and dependencies.
+  # Using preload_app=true means any application load error will
+  # cause the master process to exit with an error.
+
+  def preload_app(bool)
+    case bool
+    when TrueClass, FalseClass
+      set[:preload_app] = bool
+    else
+      raise ArgumentError, "preload_app=#{bool.inspect} not a boolean"
     end
+  end
 
-    # sets the +path+ for the PID file of the unicorn master process
-    def pid(path); set_path(:pid, path); end
-
-    # Enabling this preloads an application before forking worker
-    # processes.  This allows memory savings when using a
-    # copy-on-write-friendly GC but can cause bad things to happen when
-    # resources like sockets are opened at load time by the master
-    # process and shared by multiple children.  People enabling this are
-    # highly encouraged to look at the before_fork/after_fork hooks to
-    # properly close/reopen sockets.  Files opened for logging do not
-    # have to be reopened as (unbuffered-in-userspace) files opened with
-    # the File::APPEND flag are written to atomically on UNIX.
-    #
-    # In addition to reloading the unicorn-specific config settings,
-    # SIGHUP will reload application code in the working
-    # directory/symlink when workers are gracefully restarted when
-    # preload_app=false (the default).  As reloading the application
-    # sometimes requires RubyGems updates, +Gem.refresh+ is always
-    # called before the application is loaded (for RubyGems users).
-    #
-    # During deployments, care should _always_ be taken to ensure your
-    # applications are properly deployed and running.  Using
-    # preload_app=false (the default) means you _must_ check if
-    # your application is responding properly after a deployment.
-    # Improperly deployed applications can go into a spawn loop
-    # if the application fails to load.  While your children are
-    # in a spawn loop, it is is possible to fix an application
-    # by properly deploying all required code and dependencies.
-    # Using preload_app=true means any application load error will
-    # cause the master process to exit with an error.
-
-    def preload_app(bool)
-      case bool
-      when TrueClass, FalseClass
-        set[:preload_app] = bool
-      else
-        raise ArgumentError, "preload_app=#{bool.inspect} not a boolean"
-      end
+  # Allow redirecting $stderr to a given path.  Unlike doing this from
+  # the shell, this allows the unicorn process to know the path its
+  # writing to and rotate the file if it is used for logging.  The
+  # 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.  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
+
+  # sets the working directory for Unicorn.  This ensures SIGUSR2 will
+  # start a new instance of Unicorn in this directory.  This may be
+  # a symlink, a common scenario for Capistrano users.
+  def working_directory(path)
+    # just let chdir raise errors
+    path = File.expand_path(path)
+    if config_file &&
+       config_file[0] != ?/ &&
+       ! File.readable?("#{path}/#{config_file}")
+      raise ArgumentError,
+            "config_file=#{config_file} would not be accessible in" \
+            " working_directory=#{path}"
     end
+    Dir.chdir(path)
+    Unicorn::HttpServer::START_CTX[:cwd] = ENV["PWD"] = path
+  end
+
+  # Runs worker processes as the specified +user+ and +group+.
+  # The master process always stays running as the user who started it.
+  # This switch will occur after calling the after_fork hook, and only
+  # if the Worker#user method is not called in the after_fork hook
+  def user(user, group = nil)
+    # raises ArgumentError on invalid user/group
+    Etc.getpwnam(user)
+    Etc.getgrnam(group) if group
+    set[:user] = [ user, group ]
+  end
 
-    # Allow redirecting $stderr to a given path.  Unlike doing this from
-    # the shell, this allows the unicorn process to know the path its
-    # writing to and rotate the file if it is used for logging.  The
-    # 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)
+  # expands "unix:path/to/foo" to a socket relative to the current path
+  # expands pathnames of sockets if relative to "~" or "~username"
+  # expands "*:port and ":port" to "0.0.0.0:port"
+  def expand_addr(address) #:nodoc
+    return "0.0.0.0:#{address}" if Integer === address
+    return address unless String === address
+
+    case address
+    when %r{\Aunix:(.*)\z}
+      File.expand_path($1)
+    when %r{\A~}
+      File.expand_path(address)
+    when %r{\A(?:\*:)?(\d+)\z}
+      "0.0.0.0:#$1"
+    when %r{\A(.*):(\d+)\z}
+      # canonicalize the name
+      packed = Socket.pack_sockaddr_in($2.to_i, $1)
+      Socket.unpack_sockaddr_in(packed).reverse!.join(':')
+    else
+      address
     end
+  end
+
+private
 
-    # 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)
+  def set_path(var, path) #:nodoc:
+    case path
+    when NilClass, String
+      set[var] = path
+    else
+      raise ArgumentError
     end
+  end
 
-    # sets the working directory for Unicorn.  This ensures SIGUSR2 will
-    # start a new instance of Unicorn in this directory.  This may be
-    # a symlink, a common scenario for Capistrano users.  Unlike
-    # all other Unicorn configuration directives, this binds immediately
-    # for error checking and cannot be undone by unsetting it in the
-    # configuration file and reloading.
-    def working_directory(path)
-      # just let chdir raise errors
-      path = File.expand_path(path)
-      if config_file &&
-         config_file[0] != ?/ &&
-         ! File.readable?("#{path}/#{config_file}")
+  def set_hook(var, my_proc, req_arity = 2) #:nodoc:
+    case my_proc
+    when Proc
+      arity = my_proc.arity
+      (arity == req_arity) or \
         raise ArgumentError,
-              "config_file=#{config_file} would not be accessible in" \
-              " working_directory=#{path}"
-      end
-      Dir.chdir(path)
-      HttpServer::START_CTX[:cwd] = ENV["PWD"] = path
+              "#{var}=#{my_proc.inspect} has invalid arity: " \
+              "#{arity} (need #{req_arity})"
+    when NilClass
+      my_proc = DEFAULTS[var]
+    else
+      raise ArgumentError, "invalid type: #{var}=#{my_proc.inspect}"
     end
+    set[var] = my_proc
+  end
 
-    # Runs worker processes as the specified +user+ and +group+.
-    # The master process always stays running as the user who started it.
-    # This switch will occur after calling the after_fork hook, and only
-    # if the Worker#user method is not called in the after_fork hook
-    def user(user, group = nil)
-      # raises ArgumentError on invalid user/group
-      Etc.getpwnam(user)
-      Etc.getgrnam(group) if group
-      set[:user] = [ user, group ]
-    end
+  # this is called _after_ working_directory is bound.  This only
+  # parses the embedded switches in .ru files
+  # (for "rackup" compatibility)
+  def parse_rackup_file # :nodoc:
+    ru = RACKUP[:file] or return # we only return here in unit tests
 
-    # expands "unix:path/to/foo" to a socket relative to the current path
-    # expands pathnames of sockets if relative to "~" or "~username"
-    # expands "*:port and ":port" to "0.0.0.0:port"
-    def expand_addr(address) #:nodoc
-      return "0.0.0.0:#{address}" if Integer === address
-      return address unless String === address
-
-      case address
-      when %r{\Aunix:(.*)\z}
-        File.expand_path($1)
-      when %r{\A~}
-        File.expand_path(address)
-      when %r{\A(?:\*:)?(\d+)\z}
-        "0.0.0.0:#$1"
-      when %r{\A(.*):(\d+)\z}
-        # canonicalize the name
-        packed = Socket.pack_sockaddr_in($2.to_i, $1)
-        Socket.unpack_sockaddr_in(packed).reverse!.join(':')
-      else
-        address
-      end
+    # :rails means use (old) Rails autodetect
+    if ru == :rails
+      File.readable?('config.ru') or return
+      ru = 'config.ru'
     end
 
-  private
+    File.readable?(ru) or
+      raise ArgumentError, "rackup file (#{ru}) not readable"
 
-    def set_path(var, path) #:nodoc:
-      case path
-      when NilClass, String
-        set[var] = path
-      else
-        raise ArgumentError
-      end
-    end
+    # it could be a .rb file, too, we don't parse those manually
+    ru =~ /\.ru\z/ or return
 
-    def set_hook(var, my_proc, req_arity = 2) #:nodoc:
-      case my_proc
-      when Proc
-        arity = my_proc.arity
-        (arity == req_arity) or \
-          raise ArgumentError,
-                "#{var}=#{my_proc.inspect} has invalid arity: " \
-                "#{arity} (need #{req_arity})"
-      when NilClass
-        my_proc = DEFAULTS[var]
-      else
-        raise ArgumentError, "invalid type: #{var}=#{my_proc.inspect}"
-      end
-      set[var] = my_proc
-    end
+    /^#\\(.*)/ =~ File.read(ru) or return
+    RACKUP[:optparse].parse!($1.split(/\s+/))
 
-    # this is called _after_ working_directory is bound.  This only
-    # parses the embedded switches in .ru files
-    # (for "rackup" compatibility)
-    def parse_rackup_file # :nodoc:
-      ru = RACKUP[:file] or return # we only return here in unit tests
+    # XXX ugly as hell, WILL FIX in 2.x (along with Rainbows!/Zbatery)
+    host, port, set_listener, options, daemonize =
+                    eval("[ host, port, set_listener, options, daemonize ]",
+                         TOPLEVEL_BINDING)
 
-      # :rails means use (old) Rails autodetect
-      if ru == :rails
-        File.readable?('config.ru') or return
-        ru = 'config.ru'
-      end
+    # XXX duplicate code from bin/unicorn{,_rails}
+    set[:listeners] << "#{host}:#{port}" if set_listener
 
-      File.readable?(ru) or
-        raise ArgumentError, "rackup file (#{ru}) not readable"
-
-      # it could be a .rb file, too, we don't parse those manually
-      ru =~ /\.ru\z/ or return
-
-      /^#\\(.*)/ =~ File.read(ru) or return
-      RACKUP[:optparse].parse!($1.split(/\s+/))
-
-      # XXX ugly as hell, WILL FIX in 2.x (along with Rainbows!/Zbatery)
-      host, port, set_listener, options, daemonize =
-                      eval("[ host, port, set_listener, options, daemonize ]",
-                           TOPLEVEL_BINDING)
-
-      # XXX duplicate code from bin/unicorn{,_rails}
-      set[:listeners] << "#{host}:#{port}" if set_listener
-
-      if daemonize
-        # unicorn_rails wants a default pid path, (not plain 'unicorn')
-        if after_reload
-          spid = set[:pid]
-          pid('tmp/pids/unicorn.pid') if spid.nil? || spid == :unset
-        end
-        unless RACKUP[:daemonized]
-          Unicorn::Launcher.daemonize!(options)
-          RACKUP[:ready_pipe] = options.delete(:ready_pipe)
-        end
+    if daemonize
+      # unicorn_rails wants a default pid path, (not plain 'unicorn')
+      if after_reload
+        spid = set[:pid]
+        pid('tmp/pids/unicorn.pid') if spid.nil? || spid == :unset
+      end
+      unless RACKUP[:daemonized]
+        Unicorn::Launcher.daemonize!(options)
+        RACKUP[:ready_pipe] = options.delete(:ready_pipe)
       end
     end
-
   end
 end