unicorn 2.0.0pre3 → 2.0.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -175,7 +175,7 @@ NEWS: GIT-VERSION-FILE .manifest
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE = 1.1.4
+SINCE = 1.1.5
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)
@@ -195,7 +195,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 -a -t "$(shell sed -ne '1s/^= //p' README)"
+	rdoc -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/examples/unicorn.conf.rb

@@ -63,7 +63,10 @@ before_fork do |server, worker|
   #   end
   # end
   #
-  # # *optionally* throttle the master from forking too quickly by sleeping
+  # Throttle the master from forking too quickly by sleeping.  Due
+  # to the implementation of standard Unix signal handlers, this
+  # helps (but does not completely) prevent identical, repeated signals
+  # from being lost when the receiving process is busy.
   # sleep 1
 end
 

data/lib/unicorn/configurator.rb

@@ -8,7 +8,9 @@ require 'logger'
 # 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)
+class Unicorn::Configurator
+  attr_accessor :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
@@ -42,21 +44,24 @@ class Unicorn::Configurator < Struct.new(:set, :config_file, :after_reload)
 
   def initialize(defaults = {}) #:nodoc:
     self.set = Hash.new(:unset)
-    use_defaults = defaults.delete(:use_defaults)
+    @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) }
+    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
+    reload(false)
   end
 
-  def reload #:nodoc:
+  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
 
     parse_rackup_file
@@ -401,7 +406,10 @@ class Unicorn::Configurator < Struct.new(:set, :config_file, :after_reload)
 
   # 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.
+  # 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)

data/lib/unicorn/const.rb

@@ -7,8 +7,8 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  # The current version of Unicorn, currently 2.0.0pre3
-  UNICORN_VERSION = "2.0.0pre3"
+  # The current version of Unicorn, currently 2.0.0
+  UNICORN_VERSION = "2.0.0"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"

data/lib/unicorn/http_server.rb

@@ -50,6 +50,10 @@ class Unicorn::HttpServer
   # signal queue used for self-piping
   SIG_QUEUE = []
 
+  # list of signals we care about and trap in master.
+  QUEUE_SIGS = [ :WINCH, :QUIT, :INT, :TERM, :USR1, :USR2, :HUP, :TTIN, :TTOU ]
+
+  # :startdoc:
   # We populate this at startup so we can figure out how to reexecute
   # and upgrade the currently running instance of Unicorn
   # This Hash is considered a stable interface and changing its contents
@@ -82,7 +86,6 @@ class Unicorn::HttpServer
       }.call,
     0 => $0.dup,
   }
-  # :startdoc:
 
   # Creates a working server on host:port (strange things happen if
   # port isn't a Number).  Use HttpServer::run to start the server and
@@ -151,8 +154,8 @@ class Unicorn::HttpServer
     # setup signal handlers before writing pid file in case people get
     # trigger happy and send signals as soon as the pid file exists.
     # Note that signals don't actually get handled until the #join method
-    QUEUE_SIGS.each { |sig| trap_deferred(sig) }
-    trap(:CHLD) { |_| awaken_master }
+    QUEUE_SIGS.each { |sig| trap(sig) { SIG_QUEUE << sig; awaken_master } }
+    trap(:CHLD) { awaken_master }
     self.pid = config[:pid]
 
     self.master_pid = $$
@@ -287,14 +290,14 @@ class Unicorn::HttpServer
       when nil
         # avoid murdering workers after our master process (or the
         # machine) comes out of suspend/hibernation
-        if (last_check + timeout) >= (last_check = Time.now)
-          murder_lazy_workers
+        if (last_check + @timeout) >= (last_check = Time.now)
+          sleep_time = murder_lazy_workers
         else
           # wait for workers to wakeup on suspend
-          master_sleep(timeout/2.0 + 1)
+          sleep_time = @timeout/2.0 + 1
         end
         maintain_worker_count if respawn
-        master_sleep(1)
+        master_sleep(sleep_time)
       when :QUIT # graceful shutdown
         break
       when :TERM, :INT # immediate shutdown
@@ -354,24 +357,7 @@ class Unicorn::HttpServer
 
   private
 
-  # list of signals we care about and trap in master.
-  QUEUE_SIGS = [ :WINCH, :QUIT, :INT, :TERM, :USR1, :USR2, :HUP,
-                 :TTIN, :TTOU ]
-
-  # defer a signal for later processing in #join (master process)
-  def trap_deferred(signal)
-    trap(signal) do |sig_nr|
-      if SIG_QUEUE.size < 5
-        SIG_QUEUE << signal
-        awaken_master
-      else
-        logger.error "ignoring SIG#{signal}, queue=#{SIG_QUEUE.inspect}"
-      end
-    end
-  end
-
   # 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].kgio_tryread(11)
@@ -457,15 +443,23 @@ class Unicorn::HttpServer
   # is stale for >timeout seconds, then we'll kill the corresponding
   # worker.
   def murder_lazy_workers
+    t = @timeout
+    next_sleep = 1
     WORKERS.dup.each_pair do |wpid, worker|
       stat = worker.tmp.stat
       # skip workers that disable fchmod or have never fchmod-ed
       stat.mode == 0100600 and next
-      (diff = (Time.now - stat.ctime)) <= timeout and next
+      diff = Time.now - stat.ctime
+      if diff <= t
+        tmp = t - diff
+        next_sleep < tmp and next_sleep = tmp
+        next
+      end
       logger.error "worker=#{worker.nr} PID:#{wpid} timeout " \
-                   "(#{diff}s > #{timeout}s), killing"
+                   "(#{diff}s > #{t}s), killing"
       kill_worker(:KILL, wpid) # take no prisoners for timeout violations
     end
+    next_sleep
   end
 
   def spawn_missing_workers

data/t/t0012-reload-empty-config.sh

@@ -0,0 +1,82 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 9 "reloading unset config resets defaults"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rtmpfiles unicorn_config_orig before_reload after_reload
+	cat $unicorn_config > $unicorn_config_orig
+	cat >> $unicorn_config <<EOF
+logger Logger.new(STDOUT)
+preload_app true
+timeout 0x7fffffff
+worker_processes 2
+after_fork { |s,w| }
+\$dump_cfg = lambda { |fp,srv|
+  defaults = Unicorn::Configurator::DEFAULTS
+  defaults.keys.map { |x| x.to_s }.sort.each do |key|
+    next if key =~ %r{\Astd(?:err|out)_path\z}
+    key = key.to_sym
+    def_value = defaults[key]
+    srv_value = srv.__send__(key)
+    fp << "#{key}|#{srv_value}|#{def_value}\\n"
+  end
+}
+before_fork { |s,w|
+  File.open("$before_reload", "a") { |fp| \$dump_cfg.call(fp, s) }
+}
+before_exec { |s| }
+EOF
+	unicorn -D -c $unicorn_config env.ru
+	unicorn_wait_start
+}
+
+t_begin "ensure worker is started" && {
+	curl -sSf http://$listen/ > $tmp
+}
+
+t_begin "replace config file with original(-ish)" && {
+	grep -v ^pid < $unicorn_config_orig > $unicorn_config
+	cat >> $unicorn_config <<EOF
+before_fork { |s,w|
+  File.open("$after_reload", "a") { |fp| \$dump_cfg.call(fp, s) }
+}
+EOF
+}
+
+t_begin "reload signal succeeds" && {
+	kill -HUP $unicorn_pid
+	while ! egrep '(done|error) reloading' $r_err >/dev/null
+	do
+		sleep 1
+	done
+
+	grep 'done reloading' $r_err >/dev/null
+}
+
+t_begin "ensure worker is started" && {
+	curl -sSf http://$listen/ > $tmp
+}
+
+t_begin "pid file no longer exists" && {
+	if test -f $pid
+	then
+		die "pid=$pid should not exist"
+	fi
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "check stderr" && {
+	check_stderr
+}
+
+t_begin "ensure reloading restored settings" && {
+	awk < $after_reload -F'|' '
+$1 != "before_fork" && $2 != $3 { print $0; exit(1) }
+'
+}
+
+t_done

data/unicorn.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://unicorn.bogomips.org/}
 
   summary = %q{Rack HTTP server for fast clients and Unix}
-  s.rdoc_options = [ "-Na", "-t", "Unicorn: #{summary}" ]
+  s.rdoc_options = [ "-t", "Unicorn: #{summary}" ]
   s.require_paths = %w(lib ext)
   s.rubyforge_project = %q{mongrel}
   s.summary = summary
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<rack>)
   s.add_dependency(%q<kgio>, '~> 1.3.1')
 
-  s.add_development_dependency('isolate', '~> 2.1.2')
+  s.add_development_dependency('isolate', '~> 3.0.0')
 
   # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older RubyGems
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: -766259860
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 2
   - 0
-  - 0pre3
-  version: 2.0.0pre3
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-09 00:00:00 +00:00
+date: 2010-10-27 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,12 +56,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :development
   version_requirements: *id003
 description: |-
@@ -240,6 +240,7 @@ files:
 - t/t0009-winch_ttin.sh
 - t/t0010-reap-logging.sh
 - t/t0011-active-unix-socket.sh
+- t/t0012-reload-empty-config.sh
 - t/t0300-rails3-basic.sh
 - t/t0301-rails3-missing-config-ru.sh
 - t/t0302-rails3-alt-working_directory.sh
@@ -349,7 +350,6 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- -Na
 - -t
 - "Unicorn: Rack HTTP server for fast clients and Unix"
 require_paths: 
@@ -367,14 +367,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: mongrel