thin 1.2.4 → 1.2.5

data/ext/thin_parser/thin.c

@@ -207,6 +207,9 @@ static void header_done(void *data, const char *at, size_t length)
   if (rb_hash_aref(req, global_query_string) == Qnil) {
     rb_hash_aset(req, global_query_string, global_empty);
   }
+  if (rb_hash_aref(req, global_path_info) == Qnil) {
+    rb_hash_aset(req, global_path_info, global_empty);
+  }
   
   /* set some constants */
   rb_hash_aset(req, global_server_protocol, global_server_protocol_value);

data/lib/rack/adapter/rails.rb

@@ -32,9 +32,8 @@ module Rack
       end
       
       def rack_based?
-        ActionController.const_defined?(:Dispatcher) &&
-          (ActionController::Dispatcher.instance_methods.include?(:call) ||
-           ActionController::Dispatcher.instance_methods.include?("call"))
+        rails_version = ::Rails::VERSION
+        rails_version::MAJOR >= 2 && rails_version::MINOR >= 2 && rails_version::TINY >= 3
       end
       
       def load_application

data/lib/thin/controllers/cluster.rb

@@ -1,4 +1,9 @@
+require 'socket'
+
 module Thin
+  # An exception class to handle the event that server didn't start on time
+  class RestartTimeout < RuntimeError; end
+  
   module Controllers
     # Control a set of servers.
     # * Generate start and stop commands and run them.
@@ -7,7 +12,10 @@ module Thin
     class Cluster < Controller
       # Cluster only options that should not be passed in the command sent
       # to the indiviual servers.
-      CLUSTER_OPTIONS = [:servers, :only]
+      CLUSTER_OPTIONS = [:servers, :only, :onebyone, :wait]
+      
+      # Maximum wait time for the server to be restarted
+      DEFAULT_WAIT_TIME = 30    # seconds
       
       # Create a new cluster of servers launched using +options+.
       def initialize(options)
@@ -15,7 +23,7 @@ module Thin
         # Cluster can only contain daemonized servers
         @options.merge!(:daemonize => true)
       end
-    
+      
       def first_port; @options[:port]     end
       def address;    @options[:address]  end
       def socket;     @options[:socket]   end
@@ -23,7 +31,9 @@ module Thin
       def log_file;   @options[:log]      end
       def size;       @options[:servers]  end
       def only;       @options[:only]     end
-
+      def onebyone;   @options[:onebyone] end
+      def wait;       @options[:wait]     end
+      
       def swiftiply?
         @options.has_key?(:swiftiply)
       end
@@ -54,9 +64,50 @@ module Thin
     
       # Stop and start the servers.
       def restart
-        stop
-        sleep 0.1 # Let's breath a bit shall we ?
-        start
+        unless onebyone
+          # Let's do a normal restart by defaults
+          stop
+          sleep 0.1 # Let's breath a bit shall we ?
+          start
+        else
+          with_each_server do |n| 
+            stop_server(n)
+            sleep 0.1 # Let's breath a bit shall we ?
+            start_server(n)
+            wait_until_server_started(n)
+          end
+        end
+      end
+      
+      def test_socket(number)
+        if socket
+          UNIXSocket.new(socket_for(number))
+        else
+          TCPSocket.new(address, number)
+        end
+      rescue
+        nil
+      end
+      
+      # Make sure the server is running before moving on to the next one.
+      def wait_until_server_started(number)
+        log "Waiting for server to start ..."
+        STDOUT.flush # Need this to make sure user got the message
+        
+        tries = 0
+        loop do
+          if test_socket = test_socket(number)
+            test_socket.close
+            break
+          elsif tries < wait
+            sleep 1
+            tries += 1
+          else
+            raise RestartTimeout, "The server didn't start in time. Please look at server's log file " +
+                                  "for more information, or set the value of 'wait' in your config " +
+                                  "file to be higher (defaults: 30)."
+          end
+        end
       end
     
       def server_id(number)

data/lib/thin/request.rb

@@ -13,7 +13,11 @@ module Thin
     MAX_BODY          = 1024 * (80 + 32)
     BODY_TMPFILE      = 'thin-body'.freeze
     MAX_HEADER        = 1024 * (80 + 32)
-
+    
+    INITIAL_BODY      = ''
+    # Force external_encoding of request's body to ASCII_8BIT
+    INITIAL_BODY.encode!(Encoding::ASCII_8BIT) if INITIAL_BODY.respond_to?(:encode)
+    
     # Freeze some HTTP header names & values
     SERVER_SOFTWARE   = 'SERVER_SOFTWARE'.freeze
     SERVER_NAME       = 'SERVER_NAME'.freeze
@@ -49,7 +53,7 @@ module Thin
       @parser   = Thin::HttpParser.new
       @data     = ''
       @nparsed  = 0
-      @body     = StringIO.new
+      @body     = StringIO.new(INITIAL_BODY.dup)
       @env      = {
         SERVER_SOFTWARE   => SERVER,
         SERVER_NAME       => LOCALHOST,

data/lib/thin/runner.rb

@@ -41,7 +41,8 @@ module Thin
         :pid                  => 'tmp/pids/thin.pid',
         :max_conns            => Server::DEFAULT_MAXIMUM_CONNECTIONS,
         :max_persistent_conns => Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS,
-        :require              => []
+        :require              => [],
+        :wait                 => Controllers::Cluster::DEFAULT_WAIT_TIME
       }
       
       parse!
@@ -96,6 +97,8 @@ module Thin
           opts.on("-o", "--only NUM", "Send command to only one server of the cluster") { |only| @options[:only] = only.to_i }
           opts.on("-C", "--config FILE", "Load options from config file")               { |file| @options[:config] = file }
           opts.on(      "--all [DIR]", "Send command to each config files in DIR")      { |dir| @options[:all] = dir } if Thin.linux?
+          opts.on("-O", "--onebyone", "Restart the cluster one by one (only works with restart command)") { @options[:onebyone] = true }
+          opts.on("-w", "--wait NUM", "Maximum wait time for server to be started in seconds (use with -O)") { |time| @options[:wait] = time.to_i }
         end
         
         opts.separator ""
@@ -105,7 +108,7 @@ module Thin
         opts.on("-t", "--timeout SEC", "Request or command timeout in sec " +            
                                        "(default: #{@options[:timeout]})")              { |sec| @options[:timeout] = sec.to_i }
         opts.on("-f", "--force", "Force the execution of the command")                  { @options[:force] = true }
-        opts.on(      "--max-conns NUM", "Maximum number of connections " +
+        opts.on(      "--max-conns NUM", "Maximum number of open file descriptors " +
                                          "(default: #{@options[:max_conns]})",
                                          "Might require sudo to set higher then 1024")  { |num| @options[:max_conns] = num.to_i } unless Thin.win?
         opts.on(      "--max-persistent-conns NUM",

data/lib/thin/version.rb

@@ -6,11 +6,11 @@ module Thin
   module VERSION #:nodoc:
     MAJOR    = 1
     MINOR    = 2
-    TINY     = 4
+    TINY     = 5
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Flaming Astroboy".freeze
+    CODENAME = "This Is Not A Web Server".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

data/spec/controllers/cluster_spec.rb

@@ -232,4 +232,36 @@ describe Cluster, "with Swiftiply" do
     def options_for_swiftiply(number)
       { :address => '0.0.0.0', :port => 3000, :daemonize => true, :log => "thin.#{number}.log", :timeout => 10, :pid => "thin.#{number}.pid", :chdir => "/rails_app", :swiftiply => true }
     end
+end
+
+describe Cluster, "rolling restart" do
+  before do
+    @cluster = Cluster.new(:chdir => '/rails_app',
+                           :address => '0.0.0.0',
+                           :port => 3000, 
+                           :servers => 2,
+                           :timeout => 10,
+                           :log => 'thin.log',
+                           :pid => 'thin.pid',
+                           :onebyone => true,
+                           :wait => 30
+                          )
+  end
+  
+  it "should restart servers one by one" do
+    Command.should_receive(:run).with(:stop, options_for_port(3000))
+    Command.should_receive(:run).with(:start, options_for_port(3000))
+    @cluster.should_receive(:wait_until_server_started).with(3000)
+    
+    Command.should_receive(:run).with(:stop, options_for_port(3001))
+    Command.should_receive(:run).with(:start, options_for_port(3001))
+    @cluster.should_receive(:wait_until_server_started).with(3001)
+    
+    @cluster.restart
+  end
+  
+  private
+    def options_for_port(port)
+      { :daemonize => true, :log => "thin.#{port}.log", :timeout => 10, :address => "0.0.0.0", :port => port, :pid => "thin.#{port}.pid", :chdir => "/rails_app" }
+    end
 end

data/spec/request/parser_spec.rb

@@ -209,7 +209,35 @@ EOS
       parser     = HttpParser.new
       req        = {}
       nread      = parser.execute(req, req_str, 0)
-      req.should be_has_key('HTTP_HOS_T')
+      req.should have_key('HTTP_HOS_T')
     }
   end
+  
+  it "should parse PATH_INFO with semicolon" do
+    qs = "QUERY_STRING"
+    pi = "PATH_INFO"
+    {
+      "/1;a=b?c=d&e=f" => { qs => "c=d&e=f", pi => "/1;a=b" },
+      "/1?c=d&e=f" => { qs => "c=d&e=f", pi => "/1" },
+      "/1;a=b" => { qs => "", pi => "/1;a=b" },
+      "/1;a=b?" => { qs => "", pi => "/1;a=b" },
+      "/1?a=b;c=d&e=f" => { qs => "a=b;c=d&e=f", pi => "/1" },
+      "*" => { qs => "", pi => "" },
+    }.each do |uri, expect|
+      parser     = HttpParser.new
+      env        = {}
+      nread      = parser.execute(env, "GET #{uri} HTTP/1.1\r\nHost: www.example.com\r\n\r\n", 0)
+
+      env[pi].should == expect[pi]
+      env[qs].should == expect[qs]
+      env["REQUEST_URI"].should == uri
+
+      next if uri == "*"
+      
+      # Validate w/ Ruby's URI.parse
+      uri = URI.parse("http://example.com#{uri}")
+      env[qs].should == uri.query.to_s
+      env[pi].should == uri.path
+    end
+  end
 end

data/spec/request/processing_spec.rb

@@ -42,4 +42,8 @@ describe Request, 'processing' do
     big_headers = "X-Test: X\r\n" * (1024 * (80 + 32))
     proc { R("GET / HTTP/1.1\r\n#{big_headers}\r\n") }.should raise_error(InvalidRequest)
   end
+  
+  it "should set body external encoding to ASCII_8BIT" do
+    Request.new.body.external_encoding.should == Encoding::ASCII_8BIT
+  end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ require 'spec'
 require 'benchmark'
 require 'timeout'
 require 'fileutils'
-require 'benchmark_unit'
 require 'net/http'
 require 'socket'
 
@@ -23,6 +22,7 @@ end
 module Matchers
   class BeFasterThen
     def initialize(max_time)
+      require 'benchmark_unit'
       @max_time = max_time
     end
 

data/tasks/gem.rake

@@ -1,8 +1,6 @@
 require 'rake/gempackagetask'
 require 'yaml'
 
-WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'x86-mswin32'
-
 task :clean => :clobber_package
 
 Thin::GemSpec = Gem::Specification.new do |s|
@@ -59,16 +57,10 @@ end
 task :gem => :tag_warn
 
 namespace :gem do
-  desc "Update the gemspec for GitHub's gem server"
-  task :github do
-    File.open("thin.gemspec", 'w') { |f| f << YAML.dump(Thin::GemSpec) }
-  end
-  
-  desc 'Upload gems (ruby & win32) to rubyforge.org'
-  task :upload => :gem do
-    sh 'rubyforge login'
-    sh "rubyforge add_release thin thin #{Thin::VERSION::STRING} pkg/#{Thin::GemSpec.full_name}.gem"
-    sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{Thin::GemSpec.full_name}.gem"
-    sh "rubyforge add_file thin thin #{Thin::VERSION::STRING} pkg/#{Thin::GemSpec.full_name}-#{WIN_SUFFIX}.gem"
+  desc 'Upload gems to gemcutter.org'
+  task :push => :gem do
+    Dir["pkg/#{Thin::GemSpec.full_name}*.gem"].each do |file|
+      puts "gem push #{file}"
+    end
   end
 end

data/tasks/spec.rake

@@ -1,49 +1,43 @@
 CLEAN.include %w(coverage tmp log)
 
-if RUBY_1_9 # RSpec not yet working w/ Ruby 1.9
-  task :spec do
-    warn 'RSpec not yet supporting Ruby 1.9, so cannot run the specs :('
-  end
-else
-  require 'spec/rake/spectask'
-  
-  PERF_SPECS = FileList['spec/perf/*_spec.rb']
-  WIN_SPECS  = %w(
-    spec/backends/unix_server_spec.rb
-    spec/controllers/service_spec.rb
-    spec/daemonizing_spec.rb
-    spec/server/unix_socket_spec.rb
-    spec/server/swiftiply_spec.rb
-  )
-  # HACK Event machine causes some problems when running multiple
-  # tests in the same VM so we split the specs in 2 before I find
-  # a better solution...
-  SPECS2     = %w(spec/server/threaded_spec.rb spec/server/tcp_spec.rb)  
-  SPECS      = FileList['spec/**/*_spec.rb'] - PERF_SPECS - SPECS2
-  
-  def spec_task(name, specs)
-    Spec::Rake::SpecTask.new(name) do |t|
-      t.libs << 'lib'
-      t.spec_opts = %w(-fs -c)
-      t.spec_files = specs
-    end
+require 'spec/rake/spectask'
+
+PERF_SPECS = FileList['spec/perf/*_spec.rb']
+WIN_SPECS  = %w(
+  spec/backends/unix_server_spec.rb
+  spec/controllers/service_spec.rb
+  spec/daemonizing_spec.rb
+  spec/server/unix_socket_spec.rb
+  spec/server/swiftiply_spec.rb
+)
+# HACK Event machine causes some problems when running multiple
+# tests in the same VM so we split the specs in 2 before I find
+# a better solution...
+SPECS2     = %w(spec/server/threaded_spec.rb spec/server/tcp_spec.rb)  
+SPECS      = FileList['spec/**/*_spec.rb'] - PERF_SPECS - SPECS2
+
+def spec_task(name, specs)
+  Spec::Rake::SpecTask.new(name) do |t|
+    t.libs << 'lib'
+    t.spec_opts = %w(-fs -c)
+    t.spec_files = specs
   end
-  
-  desc "Run all examples"
-  spec_task :spec, SPECS
-  spec_task :spec2, SPECS2
-  task :spec => [:compile, :spec2]
-  
-  desc "Run all performance examples"
-  spec_task 'spec:perf', PERF_SPECS
-  
-  task :check_benchmark_unit_gem do
-    begin
-      require 'benchmark_unit'
-    rescue LoadError
-      abort "To run specs, install benchmark_unit gem"
-    end
+end
+
+desc "Run all examples"
+spec_task :spec, SPECS
+spec_task :spec2, SPECS2
+task :spec => [:compile, :spec2]
+
+desc "Run all performance examples"
+spec_task 'spec:perf', PERF_SPECS
+
+task :check_benchmark_unit_gem do
+  begin
+    require 'benchmark_unit'
+  rescue LoadError
+    abort "To run specs, install benchmark_unit gem"
   end
-  
-  task 'spec:perf' => :check_benchmark_unit_gem
-end
+end
+
+task 'spec:perf' => :check_benchmark_unit_gem

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thin
 version: !ruby/object:Gem::Version 
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -04:00
+date: 2009-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,19 +72,14 @@ files:
 - example/thin_solaris_smf.erb
 - example/thin_solaris_smf.readme.txt
 - example/vlad.rake
-- lib/rack
-- lib/rack/adapter
 - lib/rack/adapter/loader.rb
 - lib/rack/adapter/rails.rb
-- lib/thin
-- lib/thin/backends
 - lib/thin/backends/base.rb
 - lib/thin/backends/swiftiply_client.rb
 - lib/thin/backends/tcp_server.rb
 - lib/thin/backends/unix_server.rb
 - lib/thin/command.rb
 - lib/thin/connection.rb
-- lib/thin/controllers
 - lib/thin/controllers/cluster.rb
 - lib/thin/controllers/controller.rb
 - lib/thin/controllers/service.rb
@@ -101,53 +96,36 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
-- spec/backends
 - spec/backends/swiftiply_client_spec.rb
 - spec/backends/tcp_server_spec.rb
 - spec/backends/unix_server_spec.rb
 - spec/command_spec.rb
-- spec/configs
 - spec/configs/cluster.yml
 - spec/configs/single.yml
 - spec/connection_spec.rb
-- spec/controllers
 - spec/controllers/cluster_spec.rb
 - spec/controllers/controller_spec.rb
 - spec/controllers/service_spec.rb
 - spec/daemonizing_spec.rb
 - spec/headers_spec.rb
 - spec/logging_spec.rb
-- spec/perf
 - spec/perf/request_perf_spec.rb
 - spec/perf/response_perf_spec.rb
 - spec/perf/server_perf_spec.rb
-- spec/rack
 - spec/rack/loader_spec.rb
 - spec/rack/rails_adapter_spec.rb
-- spec/rails_app
-- spec/rails_app/app
-- spec/rails_app/app/controllers
 - spec/rails_app/app/controllers/application.rb
 - spec/rails_app/app/controllers/simple_controller.rb
-- spec/rails_app/app/helpers
 - spec/rails_app/app/helpers/application_helper.rb
-- spec/rails_app/app/views
-- spec/rails_app/app/views/simple
 - spec/rails_app/app/views/simple/index.html.erb
-- spec/rails_app/config
 - spec/rails_app/config/boot.rb
 - spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments
 - spec/rails_app/config/environments/development.rb
 - spec/rails_app/config/environments/production.rb
 - spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers
 - spec/rails_app/config/initializers/inflections.rb
 - spec/rails_app/config/initializers/mime_types.rb
 - spec/rails_app/config/routes.rb
-- spec/rails_app/log
-- spec/rails_app/log/mongrel_debug
-- spec/rails_app/public
 - spec/rails_app/public/404.html
 - spec/rails_app/public/422.html
 - spec/rails_app/public/500.html
@@ -155,40 +133,33 @@ files:
 - spec/rails_app/public/dispatch.fcgi
 - spec/rails_app/public/dispatch.rb
 - spec/rails_app/public/favicon.ico
-- spec/rails_app/public/images
 - spec/rails_app/public/images/rails.png
 - spec/rails_app/public/index.html
-- spec/rails_app/public/javascripts
 - spec/rails_app/public/javascripts/application.js
 - spec/rails_app/public/javascripts/controls.js
 - spec/rails_app/public/javascripts/dragdrop.js
 - spec/rails_app/public/javascripts/effects.js
 - spec/rails_app/public/javascripts/prototype.js
 - spec/rails_app/public/robots.txt
-- spec/rails_app/script
 - spec/rails_app/script/about
 - spec/rails_app/script/console
 - spec/rails_app/script/destroy
 - spec/rails_app/script/generate
-- spec/rails_app/script/performance
 - spec/rails_app/script/performance/benchmarker
 - spec/rails_app/script/performance/profiler
 - spec/rails_app/script/performance/request
 - spec/rails_app/script/plugin
-- spec/rails_app/script/process
 - spec/rails_app/script/process/inspector
 - spec/rails_app/script/process/reaper
 - spec/rails_app/script/process/spawner
 - spec/rails_app/script/runner
 - spec/rails_app/script/server
-- spec/request
 - spec/request/mongrel_spec.rb
 - spec/request/parser_spec.rb
 - spec/request/persistent_spec.rb
 - spec/request/processing_spec.rb
 - spec/response_spec.rb
 - spec/runner_spec.rb
-- spec/server
 - spec/server/builder_spec.rb
 - spec/server/pipelining_spec.rb
 - spec/server/robustness_spec.rb
@@ -217,6 +188,8 @@ files:
 - ext/thin_parser/parser.rl
 has_rdoc: true
 homepage: http://code.macournoyer.com/thin/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -237,9 +210,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thin
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A thin and fast web server
 test_files: []