unicorn 0.95.3 → 0.96.0

data/Documentation/unicorn.1.txt

@@ -13,8 +13,8 @@ unicorn [-c CONFIG_FILE] [-E RACK_ENV] [-D] [RACKUP_FILE]
 # DESCRIPTION
 
 A rackup(1)-like command to launch Rack applications using Unicorn.
-It is expected to be started in your application root (APP_ROOT), but
-"Dir.chdir" may also be executed in the CONFIG_FILE or RACKUP_FILE.
+It is expected to be started in your application root (APP_ROOT),
+but the "working_directory" directive may be used in the CONFIG_FILE.
 
 While Unicorn takes a myriad of command-line options for
 compatibility with ruby(1) and rackup(1), it is recommended to stick
@@ -33,10 +33,9 @@ with rackup(1) but strongly discouraged.
 # UNICORN OPTIONS
 -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 (e.g.
-    "Dir.chdir", "Process::UID.change_privilege").  See the RDoc/ri
-    for the *Unicorn::Configurator* class for the full list of
-    directives available from the DSL.
+    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.
 
 -D, \--daemonize
 :   Run daemonized in the background.  The process is detached from

data/Documentation/unicorn_rails.1.txt

@@ -14,8 +14,7 @@ unicorn_rails [-c CONFIG_FILE] [-E RAILS_ENV] [-D] [RACKUP_FILE]
 
 A rackup(1)-like command to launch Rails applications using Unicorn.  It
 is expected to be started in your Rails application root (RAILS_ROOT),
-but "Dir.chdir" may also be executed in the CONFIG_FILE or
-optionally, RACKUP_FILE.
+but the "working_directory" directive may be used in the CONFIG_FILE.
 
 The outward interface resembles rackup(1), the internals and default
 middleware loading is designed like the `script/server` command
@@ -29,10 +28,9 @@ as much as possible.
 # UNICORN OPTIONS
 -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 (e.g.
-    "Dir.chdir", "Process::UID.change_privilege").  See the RDoc/ri
-    for the *Unicorn::Configurator* class for the full list of
-    directives available from the DSL.
+    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.
 
 -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=v0.95.3.GIT
+DEF_VER=v0.96.0.GIT
 
 LF='
 '

data/GNUmakefile

@@ -159,11 +159,11 @@ manifest: $(pkg_extra) man
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
 
-NEWS: GIT-VERSION-FILE
+NEWS: GIT-VERSION-FILE .manifest
 	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
-SINCE = 0.94.0
+SINCE = 0.95.0
 ChangeLog: LOG_VERSION = \
   $(shell git rev-parse -q "$(GIT_VERSION)" >/dev/null 2>&1 && \
           echo $(GIT_VERSION) || git describe)

data/bin/unicorn

@@ -1,4 +1,4 @@
-#!/home/ew/bin/ruby
+#!/this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby
 # -*- encoding: binary -*-
 require 'unicorn/launcher'
 require 'optparse'
@@ -161,5 +161,5 @@ if $DEBUG
   })
 end
 
-Unicorn::Launcher.daemonize! if daemonize
+Unicorn::Launcher.daemonize!(options) if daemonize
 Unicorn.run(app, options)

data/bin/unicorn_rails

@@ -1,4 +1,4 @@
-#!/home/ew/bin/ruby
+#!/this/will/be/overwritten/or/wrapped/anyways/do/not/worry/ruby
 # -*- encoding: binary -*-
 require 'unicorn/launcher'
 require 'optparse'
@@ -202,6 +202,6 @@ end
 
 if daemonize
   options[:pid] = rails_pid
-  Unicorn::Launcher.daemonize!
+  Unicorn::Launcher.daemonize!(options)
 end
 Unicorn.run(app, options)

data/lib/unicorn.rb

@@ -38,7 +38,7 @@ module Unicorn
                                 :before_fork, :after_fork, :before_exec,
                                 :logger, :pid, :app, :preload_app,
                                 :reexec_pid, :orig_app, :init_listeners,
-                                :master_pid, :config)
+                                :master_pid, :config, :ready_pipe)
     include ::Unicorn::SocketHelper
 
     # prevents IO objects in here from being GC-ed
@@ -162,6 +162,7 @@ module Unicorn
     def initialize(app, options = {})
       self.app = app
       self.reexec_pid = 0
+      self.ready_pipe = options.delete(:ready_pipe)
       self.init_listeners = options[:listeners] ? options[:listeners].dup : []
       self.config = Configurator.new(options.merge(:use_defaults => true))
       self.listener_opts = {}
@@ -249,6 +250,10 @@ module Unicorn
     def stdout_path=(path); redirect_io($stdout, path); end
     def stderr_path=(path); redirect_io($stderr, path); end
 
+    def logger=(obj)
+      HttpRequest::DEFAULTS["rack.logger"] = super
+    end
+
     # sets the path for the PID file of the master process
     def pid=(path)
       if path
@@ -306,6 +311,9 @@ module Unicorn
                      "(#{tries < 0 ? 'infinite' : tries} tries left)"
         sleep(delay)
         retry
+      rescue => err
+        logger.fatal "error adding listener addr=#{address}"
+        raise err
       end
     end
 
@@ -324,6 +332,11 @@ module Unicorn
       trap(:CHLD) { |sig_nr| awaken_master }
       proc_name 'master'
       logger.info "master process ready" # test_exec.rb relies on this message
+      if ready_pipe
+        ready_pipe.syswrite($$.to_s)
+        ready_pipe.close rescue nil
+        self.ready_pipe = nil
+      end
       begin
         loop do
           reap_all_workers
@@ -528,7 +541,11 @@ module Unicorn
         WORKERS.values.include?(worker_nr) and next
         worker = Worker.new(worker_nr, Unicorn::Util.tmpio)
         before_fork.call(self, worker)
-        WORKERS[fork { worker_loop(worker) }] = worker
+        WORKERS[fork {
+          ready_pipe.close if ready_pipe
+          self.ready_pipe = nil
+          worker_loop(worker)
+        }] = worker
       end
     end
 

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.95.3"
+    UNICORN_VERSION="0.96.0"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port

data/lib/unicorn/http_request.rb

@@ -12,7 +12,7 @@ module Unicorn
       "rack.multiprocess" => true,
       "rack.multithread" => false,
       "rack.run_once" => false,
-      "rack.version" => [1, 0],
+      "rack.version" => [1, 1],
       "SCRIPT_NAME" => "",
 
       # this is not in the Rack spec, but some apps may rely on it

data/lib/unicorn/http_response.rb

@@ -47,7 +47,8 @@ module Unicorn
         headers.each do |key, value|
           next if SKIP.include?(key.downcase)
           if value =~ /\n/
-            out.concat(value.split(/\n/).map! { |v| "#{key}: #{v}\r\n" })
+            # avoiding blank, key-only cookies with /\n+/
+            out.concat(value.split(/\n+/).map! { |v| "#{key}: #{v}\r\n" })
           else
             out << "#{key}: #{value}\r\n"
           end

data/lib/unicorn/launcher.rb

@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
 
-$stdin.sync = $stdout.sync = $stderr.sync = true
+$stdout.sync = $stderr.sync = true
 $stdin.binmode
 $stdout.binmode
 $stderr.binmode
@@ -19,21 +19,47 @@ class Unicorn::Launcher
   #     the directory it was started in when being re-executed
   #     to pickup code changes if the original deployment directory
   #     is a symlink or otherwise got replaced.
-  def self.daemonize!
+  def self.daemonize!(options = nil)
     $stdin.reopen("/dev/null")
 
     # We only start a new process group if we're not being reexecuted
     # and inheriting file descriptors from our parent
     unless ENV['UNICORN_FD']
-      exit if fork
-      Process.setsid
-      exit if fork
+      if options
+        # grandparent - reads pipe, exits when master is ready
+        #  \_ parent  - exits immediately ASAP
+        #      \_ unicorn master - writes to pipe when ready
 
+        rd, wr = IO.pipe
+        grandparent = $$
+        if fork
+          wr.close # grandparent does not write
+        else
+          rd.close # unicorn master does not read
+          Process.setsid
+          exit if fork # parent dies now
+        end
+
+        if grandparent == $$
+          # this will block until HttpServer#join runs (or it dies)
+          master_pid = (rd.readpartial(16) rescue nil).to_i
+          unless master_pid > 1
+            warn "master failed to start, check stderr log for details"
+            exit!(1)
+          end
+          exit 0
+        else # unicorn master process
+          options[:ready_pipe] = wr
+        end
+      else # backwards compat
+        exit if fork
+        Process.setsid
+        exit if fork
+      end
       # $stderr/$stderr can/will be redirected separately in the Unicorn config
       Unicorn::Configurator::DEFAULTS[:stderr_path] = "/dev/null"
       Unicorn::Configurator::DEFAULTS[:stdout_path] = "/dev/null"
     end
-    $stdin.sync = $stdout.sync = $stderr.sync = true
   end
 
 end

data/local.mk.sample

@@ -5,7 +5,7 @@
 # This is depends on a bunch of GNU-isms from bash, sed, touch.
 
 DLEXT := so
-gems := rack-1.0.1
+gems := rack-1.1.0
 
 # Avoid loading rubygems to speed up tests because gmake is
 # fork+exec heavy with Ruby.

data/test/exec/test_exec.rb

@@ -805,7 +805,7 @@ EOF
       exec($unicorn_bin, "-D", "-l#{@addr}:#{@port}", "-c#{ucfg.path}")
     end
     pid, status = Process.waitpid2(pid)
-    assert status.success?, "original process exited successfully"
+    assert ! status.success?, "original process exited successfully"
     sleep 1 # can't waitpid on a daemonized process :<
     assert err.stat.size > 0
   end

data/test/unit/test_server.rb

@@ -228,6 +228,16 @@ class WebServerTest < Test::Unit::TestCase
     end
   end
 
+  def test_logger_set
+    assert_equal @server.logger, Unicorn::HttpRequest::DEFAULTS["rack.logger"]
+  end
+
+  def test_logger_changed
+    tmp = Logger.new($stdout)
+    @server.logger = tmp
+    assert_equal tmp, Unicorn::HttpRequest::DEFAULTS["rack.logger"]
+  end
+
   def test_bad_client_400
     sock = nil
     assert_nothing_raised do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.95.3
+  version: 0.96.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +00:00
+date: 2010-01-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -191,22 +191,22 @@ files:
 - test/rails/app-2.2.2/log/.gitignore
 - test/rails/app-2.2.2/public/404.html
 - test/rails/app-2.2.2/public/500.html
-- test/rails/app-2.3.3.1/.gitignore
-- test/rails/app-2.3.3.1/Rakefile
-- test/rails/app-2.3.3.1/app/controllers/application_controller.rb
-- test/rails/app-2.3.3.1/app/controllers/foo_controller.rb
-- test/rails/app-2.3.3.1/app/helpers/application_helper.rb
-- test/rails/app-2.3.3.1/config/boot.rb
-- test/rails/app-2.3.3.1/config/database.yml
-- test/rails/app-2.3.3.1/config/environment.rb
-- test/rails/app-2.3.3.1/config/environments/development.rb
-- test/rails/app-2.3.3.1/config/environments/production.rb
-- test/rails/app-2.3.3.1/config/routes.rb
-- test/rails/app-2.3.3.1/db/.gitignore
-- test/rails/app-2.3.3.1/log/.gitignore
-- test/rails/app-2.3.3.1/public/404.html
-- test/rails/app-2.3.3.1/public/500.html
-- test/rails/app-2.3.3.1/public/x.txt
+- test/rails/app-2.3.5/.gitignore
+- test/rails/app-2.3.5/Rakefile
+- test/rails/app-2.3.5/app/controllers/application_controller.rb
+- test/rails/app-2.3.5/app/controllers/foo_controller.rb
+- test/rails/app-2.3.5/app/helpers/application_helper.rb
+- test/rails/app-2.3.5/config/boot.rb
+- test/rails/app-2.3.5/config/database.yml
+- test/rails/app-2.3.5/config/environment.rb
+- test/rails/app-2.3.5/config/environments/development.rb
+- test/rails/app-2.3.5/config/environments/production.rb
+- test/rails/app-2.3.5/config/routes.rb
+- test/rails/app-2.3.5/db/.gitignore
+- test/rails/app-2.3.5/log/.gitignore
+- test/rails/app-2.3.5/public/404.html
+- test/rails/app-2.3.5/public/500.html
+- test/rails/app-2.3.5/public/x.txt
 - test/rails/test_rails.rb
 - test/test_helper.rb
 - test/unit/test_configurator.rb