unicorn 0.6.0 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.7.0 - rack.version is 1.0
 v0.6.0 - cleanups + optimizations, signals to {in,de}crement processes
 v0.5.4 - fix data corruption with some small uploads (not curl)
 v0.5.3 - fix 100% CPU usage when idle, small cleanups

data/SIGNALS

@@ -6,28 +6,28 @@ processes are documented here as well.
 
 === Master Process
 
- * HUP - reload config file and gracefully restart all workers
-   If "preload_app" is false (the default), the application code
-   will be reloaded when workers are restarted as well.
+* HUP - reload config file and gracefully restart all workers
+  If "preload_app" is false (the default), the application code
+  will be reloaded when workers are restarted as well.
 
- * INT/TERM - quick shutdown, kills all workers immediately
+* INT/TERM - quick shutdown, kills all workers immediately
 
- * QUIT - graceful shutdown, waits for workers to finish their
-   current request before finishing.
+* QUIT - graceful shutdown, waits for workers to finish their
+  current request before finishing.
 
- * USR1 - reopen all logs owned by the master and all workers
-   See Unicorn::Util.reopen_logs for what is considered a log.
+* USR1 - reopen all logs owned by the master and all workers
+  See Unicorn::Util.reopen_logs for what is considered a log.
 
- * USR2 - reexecute the running binary.  A separate QUIT
-   should be sent to the original process once the child is verified to
-   be up and running.
+* USR2 - reexecute the running binary.  A separate QUIT
+  should be sent to the original process once the child is verified to
+  be up and running.
 
- * WINCH - gracefully stops workers but keep the master running.
-   This will only work for daemonized processes.
+* WINCH - gracefully stops workers but keep the master running.
+  This will only work for daemonized processes.
 
- * TTIN - increment the number of worker processes by one
+* TTIN - increment the number of worker processes by one
 
- * TTOU - decrement the number of worker processes by one
+* TTOU - decrement the number of worker processes by one
 
 === Worker Processes
 
@@ -35,19 +35,19 @@ Sending signals directly to the worker processes should not normally be
 needed.  If the master process is running, any exited worker will be
 automatically respawned.
 
- * INT/TERM - Quick shutdown, immediately exit.
-   Unless WINCH has been sent to the master (or the master is killed),
-   the master process will respawn a worker to replace this one.
+* INT/TERM - Quick shutdown, immediately exit.
+  Unless WINCH has been sent to the master (or the master is killed),
+  the master process will respawn a worker to replace this one.
 
- * QUIT - Gracefully exit after finishing the current request.
-   Unless WINCH has been sent to the master (or the master is killed),
-   the master process will respawn a worker to replace this one.
+* QUIT - Gracefully exit after finishing the current request.
+  Unless WINCH has been sent to the master (or the master is killed),
+  the master process will respawn a worker to replace this one.
 
- * USR1 - Reopen all logs owned by the worker process.
-   See Unicorn::Util.reopen_logs for what is considered a log.
-   Log files are not reopened until it is done processing
-   the current request, so multiple log lines for one request
-   (as done by Rails) will not be split across multiple logs.
+* USR1 - Reopen all logs owned by the worker process.
+  See Unicorn::Util.reopen_logs for what is considered a log.
+  Log files are not reopened until it is done processing
+  the current request, so multiple log lines for one request
+  (as done by Rails) will not be split across multiple logs.
 
 === Procedure to replace a running unicorn executable
 

data/lib/unicorn.rb

@@ -478,7 +478,7 @@ module Unicorn
       client = nil
 
       # closing anything we IO.select on will raise EBADF
-      trap(:USR1) { nr = -65536; rd.close rescue nil }
+      trap(:USR1) { nr = -65536; SELF_PIPE.first.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"

data/lib/unicorn/configurator.rb

@@ -297,6 +297,7 @@ module Unicorn
     # 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
@@ -304,7 +305,7 @@ module Unicorn
         File.expand_path($1)
       when %r{\A~}
         File.expand_path(address)
-      when %r{\A\*:(\d+)\z}
+      when %r{\A(?:\*:)?(\d+)\z}
         "0.0.0.0:#$1"
       when %r{\A(.*):(\d+)\z}
         # canonicalize the name

data/lib/unicorn/const.rb

@@ -59,7 +59,7 @@ module Unicorn
     REQUEST_URI='REQUEST_URI'.freeze
     REQUEST_PATH='REQUEST_PATH'.freeze
 
-    UNICORN_VERSION="0.6.0".freeze
+    UNICORN_VERSION="0.7.0".freeze
 
     DEFAULT_HOST = "0.0.0.0".freeze # default TCP listen host address
     DEFAULT_PORT = "8080".freeze    # default TCP listen port

data/lib/unicorn/http_request.rb

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

data/local.mk.sample

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

data/test/unit/test_configurator.rb

@@ -26,6 +26,8 @@ class TestConfigurator < Test::Unit::TestCase
     assert_equal "0.0.0.0:2007", meth.call('0.0.0.0:2007')
     assert_equal "0.0.0.0:2007", meth.call(':2007')
     assert_equal "0.0.0.0:2007", meth.call('*:2007')
+    assert_equal "0.0.0.0:2007", meth.call('2007')
+    assert_equal "0.0.0.0:2007", meth.call(2007)
     assert_match %r{\A\d+\.\d+\.\d+\.\d+:2007\z}, meth.call('1:2007')
     assert_match %r{\A\d+\.\d+\.\d+\.\d+:2007\z}, meth.call('2:2007')
   end

data/unicorn.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Wong"]
-  s.date = %q{2009-04-24}
+  s.date = %q{2009-04-25}
   s.description = %q{A small fast HTTP library and server for Rack applications.}
   s.email = %q{normalperson@yhbt.net}
   s.executables = ["unicorn", "unicorn_rails"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{unicorn}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{A small fast HTTP library and server for Rack applications.}
-  s.test_files = ["test/unit/test_configurator.rb", "test/unit/test_response.rb", "test/unit/test_request.rb", "test/unit/test_signals.rb", "test/unit/test_upload.rb", "test/unit/test_http_parser.rb", "test/unit/test_socket_helper.rb", "test/unit/test_server.rb"]
+  s.test_files = ["test/unit/test_request.rb", "test/unit/test_http_parser.rb", "test/unit/test_server.rb", "test/unit/test_response.rb", "test/unit/test_configurator.rb", "test/unit/test_upload.rb", "test/unit/test_signals.rb", "test/unit/test_socket_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Eric Wong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -209,11 +209,11 @@ signing_key:
 specification_version: 2
 summary: A small fast HTTP library and server for Rack applications.
 test_files: 
-- test/unit/test_configurator.rb
-- test/unit/test_response.rb
 - test/unit/test_request.rb
-- test/unit/test_signals.rb
-- test/unit/test_upload.rb
 - test/unit/test_http_parser.rb
-- test/unit/test_socket_helper.rb
 - test/unit/test_server.rb
+- test/unit/test_response.rb
+- test/unit/test_configurator.rb
+- test/unit/test_upload.rb
+- test/unit/test_signals.rb
+- test/unit/test_socket_helper.rb