Fix randomly failing Daemonize#kill test.

Move cwd from an option to an arg in thin script.
Handle a couple of socket error in server.


git-svn-id: http://code.macournoyer.com/svn/thin/trunk@322 ab7993de-5426-0410-a80b-baa00616f331

bin/thin

@@ -23,6 +23,7 @@ require 'thin/commands'
 Thin.define_commands do
   program_name 'thin'
   version      Thin::VERSION
+  help         'Thin is a web server take can run your Rails app in no time'
 
   option :address,     :short => :a, :default => '0.0.0.0',           :message => 'Address to bind to'
   option :port,        :short => :p, :default => 3000,                :message => 'Port number to bind to',
@@ -31,9 +32,7 @@ Thin.define_commands do
   option :log_file,    :short => :l,                                  :message => 'File to write log output to'
   option :daemonize,   :short => :d,                                  :message => 'Run in the background'
   option :pid_file,    :short => :P, :default => 'tmp/pids/thin.pid', :message => 'File to write the PID (use with -d)'
-  option :cwd,         :short => :c,                                  :message => 'Change to dir before starting',
-                                     :param_name => 'PATH'
 
-  command :start, Thin::Commands::Server::Start, :valid_options => [:address, :port, :environment, :log_file, :daemonize, :pid_file, :cwd]
-  command :stop,  Thin::Commands::Server::Stop,  :valid_options => [:pid_file, :cwd]
+  command :start, Thin::Commands::Server::Start, :valid_options => [:address, :port, :environment, :log_file, :daemonize, :pid_file]
+  command :stop,  Thin::Commands::Server::Stop,  :valid_options => [:pid_file]
 end

bin/thin_cluster

@@ -20,6 +20,7 @@ require 'thin/commands'
 Thin.define_commands do
   program_name 'thin_cluster'
   version      Thin::VERSION
+  help         'Thin cluster is a monitoring tool for multiple Thin web server instances'
 
   option :address,     :short => :a, :default => '0.0.0.0',           :message => 'Address to bind to'
   option :port,        :short => :p, :default => 3000,                :message => 'Port number to bind to',

lib/thin/commands/server/start.rb

@@ -2,6 +2,10 @@ module Thin::Commands::Server
   class Start < Thin::Commands::Command
     attr_accessor :address, :port, :environment, :log_file, :daemonize, :pid_file, :cwd
 
+    def cwd
+      args.first || '.'
+    end
+
     def run
       Dir.chdir cwd
       server = Thin::Server.new(address, port,
@@ -22,5 +26,14 @@ def run
     def self.help
       "Starts a new Thin web server for a Rails application."
     end
+
+    def self.detailed_help
+      <<-EOF
+usage: thin start [PATH]
+
+  Starts a new Thin web server for the Rails application in PATH
+  (default to current directory).
+EOF
+    end      
   end
 end

lib/thin/commands/server/stop.rb

@@ -1,6 +1,10 @@
 module Thin::Commands::Server
   class Stop < Thin::Commands::Command
-    attr_accessor :pid_file, :cwd
+    attr_accessor :pid_file
+
+    def cwd
+      args.first || '.'
+    end
 
     def run
       raise Thin::Commands::CommandError, 'PID file required' unless pid_file
@@ -9,7 +13,17 @@ def run
     end
 
     def self.help
-      "Stops a web server running in the background."
+      "Stops the web server running in the background."
+    end
+
+    def self.detailed_help
+      <<-EOF
+usage: thin stop [PATH]
+
+  Stops the web server running in the background
+  which PID is in the file PATH/<pid-file>
+  (default to <current directory>/tmp/pids/thin.pid).
+EOF
     end
   end
 end

lib/thin/server.rb

@@ -45,8 +45,10 @@ def start
 
       logger.info ">> Thin web server (v#{VERSION})"
 
-      logger.info ">> Starting handlers ..."
-      @handlers.each { |h| h.start }
+      @handlers.each do |handler|
+        logger.info ">> Starting #{handler.class.name} ..."
+        handler.start
+      end
 
       logger.info ">> Listening on #{host}:#{port}, CTRL+C to stop"      
       until @stop
@@ -85,11 +87,15 @@ def process(client)
         client.write ERROR_404_RESPONSE
       end
 
+    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL, Errno::EBADF
+      client.close rescue nil
     rescue InvalidRequest => e
-      logger.error "Invalid request : #{e}"
+      logger.error "Invalid request: #{e.message}"
+      logger.error "Request data:\n#{data}"
       client.write ERROR_404_RESPONSE rescue nil
     rescue Object => e
-      logger.error "Unexpected error while processing request : #{e}"
+      logger.error "Unexpected error while processing request: #{e.inspect}"
+      logger.error e.backtrace.join("\n")
     ensure
       request.close  if request            rescue nil
       response.close if response           rescue nil

lib/transat/parser.rb

@@ -123,6 +123,10 @@ def option(name, options={})
     def command(name, klass, options={})
       @commands[name.to_s] = options.merge(:class => klass)
     end
+
+    def help(message)
+      @help = message
+    end
 
     def parse_and_execute(args=ARGV)
       begin
@@ -182,16 +186,19 @@ def usage(command=nil)
         message << "Type '#{program_name.downcase} help <command>' for help on a specific command."
         message << "Type '#{program_name.downcase} version' to get this program's version."
         message << ""
-        message << "Available subcommands are:"
+        message << "Available commands are:"
         @commands.sort.each do |command, options|
           command_klass = options[:class]
-          command_help = command_klass.respond_to?(:help) ? command_klass.help : ''
           if command_klass.respond_to?(:aliases) then
-            message << "  #{command} (#{command_klass.aliases.join(", ")})  ".ljust(15) + command_help
+            message << "  #{command} (#{command_klass.aliases.join(", ")})"
           else
-            message << "  #{command}  ".ljust(15) + command_help
+            message << "  #{command}"
           end
         end
+        if @help
+          message << ""
+          message << @help
+        end
       end
 
       message.map {|line| line.chomp}.join("\n")

test/daemonizer_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
+require 'timeout'
 
 class DaemonizerTest < Test::Unit::TestCase
   def setup
@@ -16,9 +17,9 @@ def test_daemonize
   def test_kill
     @daemonizer.daemonize { empty_loop }
 
-    sleep 1
-
-    assert File.exist?('thin.pid')
+    Timeout.timeout(5) do
+      sleep 0.5 until File.exist?('thin.pid')
+    end
 
     @daemonizer.kill