unicorn 0.91.0 → 0.92.0

data/lib/unicorn/app/exec_cgi.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'unicorn'
 
 module Unicorn::App
@@ -24,7 +26,7 @@ module Unicorn::App
       SERVER_PORT
       SERVER_PROTOCOL
       SERVER_SOFTWARE
-    ).map { |x| x.freeze }.freeze # frozen strings are faster for Hash lookups
+    ).map { |x| x.freeze } # frozen strings are faster for Hash assignments
 
     # Intializes the app, example of usage in a config.ru
     #   map "/cgit" do

data/lib/unicorn/app/inetd.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 # Copyright (c) 2009 Eric Wong
 # You can redistribute it and/or modify it under the same terms as Ruby.
 

data/lib/unicorn/app/old_rails.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 # This code is based on the original Rails handler in Mongrel
 # Copyright (c) 2005 Zed A. Shaw
 # Copyright (c) 2009 Eric Wong

data/lib/unicorn/app/old_rails/static.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 # This code is based on the original Rails handler in Mongrel
 # Copyright (c) 2005 Zed A. Shaw
 # Copyright (c) 2009 Eric Wong
@@ -18,7 +20,7 @@
 # with Unicorn and you should see a decent speed boost (but not as
 # fast as if you use a static server like nginx).
 class Unicorn::App::OldRails::Static < Struct.new(:app, :root, :file_server)
-  FILE_METHODS = { 'GET' => true, 'HEAD' => true }.freeze
+  FILE_METHODS = { 'GET' => true, 'HEAD' => true }
   REQUEST_METHOD = 'REQUEST_METHOD'.freeze
   REQUEST_URI = 'REQUEST_URI'.freeze
   PATH_INFO = 'PATH_INFO'.freeze

data/lib/unicorn/cgi_wrapper.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 # This code is based on the original CGIWrapper from Mongrel
 # Copyright (c) 2005 Zed A. Shaw
 # Copyright (c) 2009 Eric Wong
@@ -44,7 +46,7 @@ class Unicorn::CGIWrapper < ::CGI
     'language' => 'Content-Language'.freeze,
     'expires' => 'Expires'.freeze,
     'length' => CONTENT_LENGTH,
-  }.freeze
+  }
 
   # Takes an a Rackable environment, plus any additional CGI.new
   # arguments These are used internally to create a wrapper around the

data/lib/unicorn/configurator.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'socket'
 require 'logger'
 

data/lib/unicorn/const.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 module Unicorn
 
   # Frequently used constants when constructing requests or responses.  Many times
@@ -5,11 +7,11 @@ 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.91.0".freeze
+    UNICORN_VERSION="0.92.0"
 
-    DEFAULT_HOST = "0.0.0.0".freeze # default TCP listen host address
-    DEFAULT_PORT = "8080".freeze    # default TCP listen port
-    DEFAULT_LISTEN = "#{DEFAULT_HOST}:#{DEFAULT_PORT}".freeze
+    DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
+    DEFAULT_PORT = "8080"    # default TCP listen port
+    DEFAULT_LISTEN = "#{DEFAULT_HOST}:#{DEFAULT_PORT}"
 
     # The basic max request size we'll try to read.
     CHUNK_SIZE=(16 * 1024)
@@ -22,8 +24,8 @@ module Unicorn
     MAX_BODY=MAX_HEADER
 
     # common errors we'll send back
-    ERROR_400_RESPONSE = "HTTP/1.1 400 Bad Request\r\n\r\n".freeze
-    ERROR_500_RESPONSE = "HTTP/1.1 500 Internal Server Error\r\n\r\n".freeze
+    ERROR_400_RESPONSE = "HTTP/1.1 400 Bad Request\r\n\r\n"
+    ERROR_500_RESPONSE = "HTTP/1.1 500 Internal Server Error\r\n\r\n"
     EXPECT_100_RESPONSE = "HTTP/1.1 100 Continue\r\n\r\n"
 
     # A frozen format for this is about 15% faster

data/lib/unicorn/http_request.rb

@@ -1,4 +1,5 @@
-# coding:binary
+# -*- encoding: binary -*-
+
 require 'stringio'
 require 'unicorn_http'
 
@@ -11,15 +12,15 @@ module Unicorn
       "rack.multiprocess" => true,
       "rack.multithread" => false,
       "rack.run_once" => false,
-      "rack.version" => [1, 0].freeze,
-      "SCRIPT_NAME" => "".freeze,
+      "rack.version" => [1, 0],
+      "SCRIPT_NAME" => "",
 
       # this is not in the Rack spec, but some apps may rely on it
-      "SERVER_SOFTWARE" => "Unicorn #{Const::UNICORN_VERSION}".freeze
+      "SERVER_SOFTWARE" => "Unicorn #{Const::UNICORN_VERSION}"
     }
 
     NULL_IO = StringIO.new(Z)
-    LOCALHOST = '127.0.0.1'.freeze
+    LOCALHOST = '127.0.0.1'
 
     # Being explicitly single-threaded, we have certain advantages in
     # not having to worry about variables being clobbered :)

data/lib/unicorn/http_response.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'time'
 
 module Unicorn
@@ -30,7 +32,7 @@ module Unicorn
     # Rack does not set/require a Date: header.  We always override the
     # Connection: and Date: headers no matter what (if anything) our
     # Rack application sent us.
-    SKIP = { 'connection' => true, 'date' => true, 'status' => true }.freeze
+    SKIP = { 'connection' => true, 'date' => true, 'status' => true }
     OUT = [] # :nodoc
 
     def self.write_header(socket, status, headers)
@@ -67,7 +69,7 @@ module Unicorn
       body.each { |chunk| socket.write(chunk) }
       socket.close # flushes and uncorks the socket immediately
       ensure
-        body.respond_to?(:close) and body.close rescue nil
+        body.respond_to?(:close) and body.close
     end
 
   end

data/lib/unicorn/launcher.rb

@@ -1,4 +1,10 @@
+# -*- encoding: binary -*-
+
 $stdin.sync = $stdout.sync = $stderr.sync = true
+$stdin.binmode
+$stdout.binmode
+$stderr.binmode
+
 require 'unicorn'
 
 class Unicorn::Launcher

data/lib/unicorn/socket_helper.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'socket'
 
 module Unicorn
@@ -18,10 +20,8 @@ module Unicorn
       # Use the HTTP accept filter if available.
       # The struct made by pack() is defined in /usr/include/sys/socket.h
       # as accept_filter_arg
-      # We won't be seupportin the "dataready" filter unlike nginx
-      # since we only support HTTP and no other protocols
       unless `/sbin/sysctl -nq net.inet.accf.http`.empty?
-        HTTPREADY = ['httpready', nil].pack('a16a240').freeze
+        FILTER_ARG = ['httpready', nil].pack('a16a240')
       end
     end
 
@@ -44,8 +44,8 @@ module Unicorn
       # No good reason to ever have deferred accepts off
       if defined?(TCP_DEFER_ACCEPT)
         sock.setsockopt(SOL_TCP, TCP_DEFER_ACCEPT, 1) rescue nil
-      elsif defined?(SO_ACCEPTFILTER) && defined?(HTTPREADY)
-        sock.setsockopt(SOL_SOCKET, SO_ACCEPTFILTER, HTTPREADY) rescue nil
+      elsif defined?(SO_ACCEPTFILTER) && defined?(FILTER_ARG)
+        sock.setsockopt(SOL_SOCKET, SO_ACCEPTFILTER, FILTER_ARG) rescue nil
       end
     end
 

data/lib/unicorn/tee_input.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 module Unicorn
 
   # acts like tee(1) on an input input to provide a input-like stream

data/lib/unicorn/util.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'fcntl'
 require 'tmpdir'
 

data/local.mk.sample

@@ -31,6 +31,7 @@ test-19:
 publish_doc:
 	-git set-file-times
 	$(MAKE) doc
+	awk 'BEGIN{RS="=== ";ORS=""}NR==2{ print RS""$$0 }' NEWS > doc/LATEST
 	$(MAKE) doc_gz
 	rsync -av --delete doc/ dcvr:/srv/unicorn/
 	git ls-files | xargs touch
@@ -38,7 +39,8 @@ publish_doc:
 # Create gzip variants of the same timestamp as the original so nginx
 # "gzip_static on" can serve the gzipped versions directly.
 doc_gz: suf := html js css
-doc_gz: docs = $(shell find doc/ -regex '^.*\.\(html\|js\|css\)$$') doc/COPYING
+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 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done

data/setup.rb

@@ -1,3 +1,4 @@
+# -*- encoding: binary -*-
 #
 # setup.rb
 #

data/test/aggregate.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/ruby -n
+# -*- encoding: binary -*-
+
 BEGIN { $tests = $assertions = $failures = $errors = 0 }
 
 $_ =~ /(\d+) tests, (\d+) assertions, (\d+) failures, (\d+) errors/ or next

data/test/exec/test_exec.rb

@@ -1,4 +1,7 @@
+# -*- encoding: binary -*-
+
 # Copyright (c) 2009 Eric Wong
+FLOCK_PATH = File.expand_path(__FILE__)
 require 'test/test_helper'
 
 do_test = true
@@ -695,4 +698,158 @@ end
     wait_for_death(pid)
   end
 
+  def hup_test_common(preload)
+    File.open("config.ru", "wb") { |fp| fp.syswrite(HI.gsub("HI", '#$$')) }
+    pid_file = Tempfile.new('pid')
+    ucfg = Tempfile.new('unicorn_test_config')
+    ucfg.syswrite("listen '#@addr:#@port'\n")
+    ucfg.syswrite("pid '#{pid_file.path}'\n")
+    ucfg.syswrite("preload_app true\n") if preload
+    ucfg.syswrite("stderr_path 'test_stderr.#$$.log'\n")
+    ucfg.syswrite("stdout_path 'test_stdout.#$$.log'\n")
+    pid = xfork {
+      redirect_test_io { exec($unicorn_bin, "-D", "-c", ucfg.path) }
+    }
+    _, status = Process.waitpid2(pid)
+    assert status.success?
+    wait_master_ready("test_stderr.#$$.log")
+    wait_workers_ready("test_stderr.#$$.log", 1)
+    uri = URI.parse("http://#@addr:#@port/")
+    pids = Tempfile.new('worker_pids')
+    hitter = fork {
+      bodies = Hash.new(0)
+      at_exit { pids.syswrite(bodies.inspect) }
+      trap(:TERM) { exit(0) }
+      loop {
+        rv = Net::HTTP.get(uri)
+        pid = rv.to_i
+        exit!(1) if pid <= 0
+        bodies[pid] += 1
+      }
+    }
+    sleep 1 # racy
+    daemon_pid = pid_file.read.to_i
+    assert daemon_pid > 0
+    Process.kill(:HUP, daemon_pid)
+    sleep 1 # racy
+    assert_nothing_raised { Process.kill(:TERM, hitter) }
+    _, hitter_status = Process.waitpid2(hitter)
+    assert hitter_status.success?
+    pids.sysseek(0)
+    pids = eval(pids.read)
+    assert_kind_of(Hash, pids)
+    assert_equal 2, pids.size
+    pids.keys.each { |x|
+      assert_kind_of(Integer, x)
+      assert x > 0
+      assert pids[x] > 0
+    }
+    assert_nothing_raised { Process.kill(:QUIT, daemon_pid) }
+    wait_for_death(daemon_pid)
+  end
+
+  def test_preload_app_hup
+    hup_test_common(true)
+  end
+
+  def test_hup
+    hup_test_common(false)
+  end
+
+  def test_default_listen_hup_holds_listener
+    default_listen_lock do
+      res, pid_path = default_listen_setup
+      daemon_pid = File.read(pid_path).to_i
+      assert_nothing_raised { Process.kill(:HUP, daemon_pid) }
+      wait_workers_ready("test_stderr.#$$.log", 1)
+      res2 = hit(["http://#{Unicorn::Const::DEFAULT_LISTEN}/"])
+      assert_match %r{\d+}, res2.first
+      assert res2.first != res.first
+      assert_nothing_raised { Process.kill(:QUIT, daemon_pid) }
+      wait_for_death(daemon_pid)
+    end
+  end
+
+  def test_default_listen_upgrade_holds_listener
+    default_listen_lock do
+      res, pid_path = default_listen_setup
+      daemon_pid = File.read(pid_path).to_i
+      assert_nothing_raised {
+        Process.kill(:USR2, daemon_pid)
+        wait_for_file("#{pid_path}.oldbin")
+        wait_for_file(pid_path)
+        Process.kill(:QUIT, daemon_pid)
+        wait_for_death(daemon_pid)
+      }
+      daemon_pid = File.read(pid_path).to_i
+      wait_workers_ready("test_stderr.#$$.log", 1)
+      File.truncate("test_stderr.#$$.log", 0)
+
+      res2 = hit(["http://#{Unicorn::Const::DEFAULT_LISTEN}/"])
+      assert_match %r{\d+}, res2.first
+      assert res2.first != res.first
+
+      assert_nothing_raised { Process.kill(:HUP, daemon_pid) }
+      wait_workers_ready("test_stderr.#$$.log", 1)
+      File.truncate("test_stderr.#$$.log", 0)
+      res3 = hit(["http://#{Unicorn::Const::DEFAULT_LISTEN}/"])
+      assert res2.first != res3.first
+
+      assert_nothing_raised { Process.kill(:QUIT, daemon_pid) }
+      wait_for_death(daemon_pid)
+    end
+  end
+
+  def default_listen_setup
+    File.open("config.ru", "wb") { |fp| fp.syswrite(HI.gsub("HI", '#$$')) }
+    pid_path = (tmp = Tempfile.new('pid')).path
+    tmp.close!
+    ucfg = Tempfile.new('unicorn_test_config')
+    ucfg.syswrite("pid '#{pid_path}'\n")
+    ucfg.syswrite("stderr_path 'test_stderr.#$$.log'\n")
+    ucfg.syswrite("stdout_path 'test_stdout.#$$.log'\n")
+    pid = xfork {
+      redirect_test_io { exec($unicorn_bin, "-D", "-c", ucfg.path) }
+    }
+    _, status = Process.waitpid2(pid)
+    assert status.success?
+    wait_master_ready("test_stderr.#$$.log")
+    wait_workers_ready("test_stderr.#$$.log", 1)
+    File.truncate("test_stderr.#$$.log", 0)
+    res = hit(["http://#{Unicorn::Const::DEFAULT_LISTEN}/"])
+    assert_match %r{\d+}, res.first
+    [ res, pid_path ]
+  end
+
+  # we need to flock() something to prevent these tests from running
+  def default_listen_lock(&block)
+    fp = File.open(FLOCK_PATH, "rb")
+    begin
+      fp.flock(File::LOCK_EX)
+      begin
+        TCPServer.new(Unicorn::Const::DEFAULT_HOST,
+                      Unicorn::Const::DEFAULT_PORT).close
+      rescue Errno::EADDRINUSE, Errno::EACCES
+        warn "can't bind to #{Unicorn::Const::DEFAULT_LISTEN}"
+        return false
+      end
+
+      # unused_port should never take this, but we may run an environment
+      # where tests are being run against older unicorns...
+      lock_path = "#{Dir::tmpdir}/unicorn_test." \
+                  "#{Unicorn::Const::DEFAULT_LISTEN}.lock"
+      begin
+        lock = File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600)
+        yield
+      rescue Errno::EEXIST
+        lock_path = nil
+        return false
+      ensure
+        File.unlink(lock_path) if lock_path
+      end
+    ensure
+      fp.flock(File::LOCK_UN)
+    end
+  end
+
 end if do_test

data/test/rails/app-1.2.3/app/controllers/application.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 class ApplicationController < ActionController::Base
   # Pick a unique cookie name to distinguish our session data from others'
   session :session_key => "_unicorn_rails_test.#{rand}"

data/test/rails/app-1.2.3/app/controllers/foo_controller.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'digest/sha1'
 class FooController < ApplicationController
   def index

data/test/rails/app-1.2.3/app/helpers/application_helper.rb

@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 module ApplicationHelper
 end

data/test/rails/app-1.2.3/config/boot.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
   RAILS_ROOT = root_path

data/test/rails/app-1.2.3/config/environment.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined? RAILS_GEM_VERSION
   RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] # || '1.2.3'
 end

data/test/rails/app-1.2.3/config/environments/development.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = false
 config.whiny_nils = true
 config.breakpoint_server = true

data/test/rails/app-1.2.3/config/environments/production.rb

@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = true
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true