thin 1.3.1 → 1.4.0

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 1.4.0 Chromeo
+ * kill -USR1 $PID for log rotation [catwell].
+ * Fix HUP signal being reseted after deamonization [atotic].
+ * Fix error with nil addresses in Connection#socket_address.
+
+== 1.3.2 Low-bar Squat
+ * Remove mack and halcyon Rack adapters from automatic detection.
+
 == 1.3.1 Triple Espresso
  * Fix service not working pre 1.9.
 

data/README.md

@@ -0,0 +1,83 @@
+Thin
+====
+
+Tiny, fast & funny HTTP server
+
+Thin is a Ruby web server that glues together 3 of the best Ruby libraries in web history:
+
+  * The Mongrel parser: the root of Mongrel speed and security
+  * Event Machine: a network I/O library with extremely high scalability, performance and stability
+  * Rack: a minimal interface between webservers and Ruby frameworks
+
+Which makes it, with all humility, the most secure, stable, fast and extensible Ruby web server
+bundled in an easy to use gem for your own pleasure.
+
+    Site:  http://code.macournoyer.com/thin/
+    Group: http://groups.google.com/group/thin-ruby/topics
+    Bugs:  http://github.com/macournoyer/thin/issues
+    Code:  http://github.com/macournoyer/thin
+    IRC:   #thin on freenode
+
+Installation
+============
+For the latest stable version:
+
+`gem install thin`
+
+Or from source:
+
+```
+git clone git://github.com/macournoyer/thin.git
+cd thin
+rake install
+```
+
+
+Usage
+=====
+A +thin+ script offers an easy way to start your Rack application:
+
+```
+cd to/your/app
+thin start
+```
+
+But Thin is also usable with a Rack config file.
+You need to setup a config.ru file and pass it to the thin script:
+
+```ruby
+#cat config.ru
+app = proc do |env|
+ [
+   200,
+   {
+     'Content-Type' => 'text/html',
+     'Content-Length' => '2'
+   },
+   ['hi']
+ ]
+end
+
+run app
+```
+
+` thin start -R config.ru `
+
+See example directory for more samples and run 'thin -h' for usage.
+
+License
+=======
+Ruby License, http://www.ruby-lang.org/en/LICENSE.txt.
+
+Credits
+=======
+The parser was stolen from Mongrel http://mongrel.rubyforge.org by Zed Shaw.
+Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw
+<zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
+either the terms of the GPL.
+
+Thin is copyright Marc-Andre Cournoyer <macournoyer@gmail.com>
+
+Get help at http://groups.google.com/group/thin-ruby/
+Report bugs at https://github.com/macournoyer/thin/issues
+and major security issues directly to me macournoyer@gmail.com.

data/Rakefile

@@ -1,44 +1,21 @@
-RUBY_1_9 = RUBY_VERSION =~ /^1\.9/
-WIN      = (RUBY_PLATFORM =~ /mswin|cygwin/)
-SUDO     = (WIN ? "" : "sudo")
-
 require 'rake'
 require 'rake/clean'
-require 'rake/extensiontask' # from rake-compiler gem
-
-$: << File.join(File.dirname(__FILE__), 'lib')
-require 'thin/version'
+load 'thin.gemspec'
 
 # Load tasks in tasks/
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 task :default => :spec
 
-Rake::ExtensionTask.new('thin_parser', Thin::GemSpec) do |ext|
-  # enable cross compilation (requires cross compile toolchain)
-  ext.cross_compile = true
-  
-  # forces the Windows platform instead of the default one
-  # configure options only for cross compile
-  ext.cross_platform = %w( i386-mswin32 x86-mingw32 )
-end
-
-CLEAN.include %w(**/*.{o,bundle,jar,so,obj,pdb,lib,def,exp,log} ext/*/Makefile ext/*/conftest.dSYM lib/1.{8,9}})
-
-desc "Compile the Ragel state machines"
-task :ragel do
-  Dir.chdir 'ext/thin_parser' do
-    target = "parser.c"
-    File.unlink target if File.exist? target
-    sh "ragel parser.rl -G2 -o #{target}"
-    raise "Failed to compile Ragel state machine" unless File.exist? target
-  end
+desc "Build gem packages"
+task :build do
+  sh "gem build thin.gemspec"
 end
 
-desc "Build gem packages"
-task :gems do
-  sh "rake clean gem && rake cross native gem RUBY_CC_VERSION=1.8.6:1.9.1"
+desc "Push gem packages"
+task :push => :build do
+  sh "gem push thin-*.gem"
 end
 
-desc "Release version #{Thin::VERSION::STRING} gems to rubyforge"
-task :release => [:tag, "gem:push"]
+desc "Release version #{Thin::VERSION::STRING}"
+task :release => [:tag, :push]

data/example/vlad.rake

@@ -53,7 +53,7 @@ configuration is set via the thin_* variables.".cleanup
   desc "Restart the app servers"
 
   remote_task :start_app, :roles => :app do
-    run thin("restart -s #{thin_servers}")
+    run thin("restart -O -s #{thin_servers}")
   end
 
   desc "Stop the app servers"

data/lib/rack/adapter/loader.rb

@@ -11,10 +11,7 @@ module Rack
     [:rack,    'config.ru'],
     [:rails,   'config/environment.rb'],
     [:ramaze,  'start.rb'],
-    [:halcyon, 'runner.ru'],
     [:merb,    'config/init.rb'],
-    [:mack,    'config/app_config/default.yml'],
-    [:mack,    'config/configatron/default.rb'],
     [:file,    nil]
   ]
   
@@ -66,19 +63,6 @@ module Rack
         
         return Merb::Rack::Application.new
         
-      when :halcyon
-        require 'halcyon'
-        
-        $:.unshift(Halcyon.root/'lib')
-        
-        return Halcyon::Runner.new
-        
-      when :mack
-        ENV["MACK_ENV"] = options[:environment]
-        load(::File.join(options[:chdir], "Rakefile"))
-        require 'mack'
-        return Mack::Utils::Server.build_app
-        
       when :file
         return Rack::File.new(options[:chdir])
         

data/lib/thin.rb

@@ -8,40 +8,38 @@ require 'eventmachine'
 require 'rack'
 
 module Thin
-  ROOT = File.expand_path(File.dirname(__FILE__))
-  
-  autoload :Command,            "#{ROOT}/thin/command"
-  autoload :Connection,         "#{ROOT}/thin/connection"
-  autoload :Daemonizable,       "#{ROOT}/thin/daemonizing"
-  autoload :Logging,            "#{ROOT}/thin/logging"
-  autoload :Headers,            "#{ROOT}/thin/headers"
-  autoload :Request,            "#{ROOT}/thin/request"
-  autoload :Response,           "#{ROOT}/thin/response"
-  autoload :Runner,             "#{ROOT}/thin/runner"
-  autoload :Server,             "#{ROOT}/thin/server"
-  autoload :Stats,              "#{ROOT}/thin/stats"
+  autoload :Command,            "thin/command"
+  autoload :Connection,         "thin/connection"
+  autoload :Daemonizable,       "thin/daemonizing"
+  autoload :Logging,            "thin/logging"
+  autoload :Headers,            "thin/headers"
+  autoload :Request,            "thin/request"
+  autoload :Response,           "thin/response"
+  autoload :Runner,             "thin/runner"
+  autoload :Server,             "thin/server"
+  autoload :Stats,              "thin/stats"
   
   module Backends
-    autoload :Base,             "#{ROOT}/thin/backends/base"
-    autoload :SwiftiplyClient,  "#{ROOT}/thin/backends/swiftiply_client"
-    autoload :TcpServer,        "#{ROOT}/thin/backends/tcp_server"
-    autoload :UnixServer,       "#{ROOT}/thin/backends/unix_server"
+    autoload :Base,             "thin/backends/base"
+    autoload :SwiftiplyClient,  "thin/backends/swiftiply_client"
+    autoload :TcpServer,        "thin/backends/tcp_server"
+    autoload :UnixServer,       "thin/backends/unix_server"
   end
   
   module Controllers
-    autoload :Cluster,          "#{ROOT}/thin/controllers/cluster"
-    autoload :Controller,       "#{ROOT}/thin/controllers/controller"
-    autoload :Service,          "#{ROOT}/thin/controllers/service"
+    autoload :Cluster,          "thin/controllers/cluster"
+    autoload :Controller,       "thin/controllers/controller"
+    autoload :Service,          "thin/controllers/service"
   end
 end
 
-require "#{Thin::ROOT}/thin/version"
-require "#{Thin::ROOT}/thin/statuses"
-require "#{Thin::ROOT}/rack/adapter/loader"
-require "#{Thin::ROOT}/thin_parser"
+require "thin/version"
+require "thin/statuses"
+require "rack/adapter/loader"
+require "thin_parser"
 
 module Rack
   module Adapter
-    autoload :Rails, "#{Thin::ROOT}/rack/adapter/rails"
+    autoload :Rails, "rack/adapter/rails"
   end
 end

data/lib/thin/backends/base.rb

@@ -44,6 +44,8 @@ module Thin
         @maximum_connections            = Server::DEFAULT_MAXIMUM_CONNECTIONS
         @maximum_persistent_connections = Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS
         @no_epoll                       = false
+        @ssl                            = nil
+        @threaded                       = nil
       end
       
       # Start the backend and connect it.
@@ -146,4 +148,4 @@ module Thin
       
     end
   end
-end
+end

data/lib/thin/connection.rb

@@ -6,10 +6,10 @@ module Thin
   # that is opened.
   class Connection < EventMachine::Connection
     include Logging
-    
+
     # This is a template async response. N.B. Can't use string for body on 1.9
     AsyncResponse = [-1, {}, []].freeze
-    
+
     # Rack application (adapter) served by this connection.
     attr_accessor :app
 
@@ -25,7 +25,7 @@ module Thin
     # Calling the application in a threaded allowing
     # concurrent processing of requests.
     attr_writer :threaded
-    
+
     # Get the connection ready to process a request.
     def post_init
       @request  = Request.new
@@ -59,13 +59,13 @@ module Thin
       @request.remote_address = remote_address
 
       # Connection may be closed unless the App#call response was a [-1, ...]
-      # It should be noted that connection objects will linger until this 
+      # It should be noted that connection objects will linger until this
       # callback is no longer referenced, so be tidy!
       @request.async_callback = method(:post_process)
-      
+
       if @backend.ssl?
         @request.env["rack.url_scheme"] = "https"
-        
+
         if cert = get_peer_cert
           @request.env['rack.peer_cert'] = cert
         end
@@ -89,7 +89,7 @@ module Thin
     def post_process(result)
       return unless result
       result = result.to_a
-      
+
       # Status code -1 indicates that we're going to respond later (async).
       return if result.first == AsyncResponse.first
 
@@ -190,7 +190,8 @@ module Thin
     protected
       # Returns IP address of peer as a string.
       def socket_address
-        Socket.unpack_sockaddr_in(get_peername)[1]
+        peer = get_peername
+        Socket.unpack_sockaddr_in(peer)[1] if peer
       end
   end
 end

data/lib/thin/daemonizing.rb

@@ -21,7 +21,7 @@ module Thin
   # Handle stuff like:
   # * storing the PID in a file
   # * redirecting output to the log file
-  # * changing processs privileges
+  # * changing process privileges
   # * killing the process gracefully
   module Daemonizable
     attr_accessor :pid_file, :log_file
@@ -53,6 +53,8 @@ module Thin
       Dir.chdir(pwd)
       
       write_pid_file
+
+      self.after_daemonize if self.respond_to? :after_daemonize
       
       at_exit do
         log ">> Exiting!"

data/lib/thin/logging.rb

@@ -46,7 +46,7 @@ module Thin
     
     # Log an error backtrace if debugging is activated
     def log_error(e=$!)
-      STDERR.print("#{e}\n\t" + e.backtrace.join("\n\t")) if Logging.debug?
+      STDERR.print("#{e}\n\t" + e.backtrace.join("\n\t") + "\n") if Logging.debug?
     end
     module_function :log_error
     public :log_error

data/lib/thin/runner.rb

@@ -1,39 +1,39 @@
 require 'optparse'
 require 'yaml'
 
-module Thin  
+module Thin
   # CLI runner.
   # Parse options and send command to the correct Controller.
   class Runner
     COMMANDS            = %w(start stop restart config)
     LINUX_ONLY_COMMANDS = %w(install)
-    
+
     # Commands that wont load options from the config file
     CONFIGLESS_COMMANDS = %w(config install)
-    
+
     # Parsed options
     attr_accessor :options
-    
+
     # Name of the command to be runned.
     attr_accessor :command
-    
+
     # Arguments to be passed to the command.
     attr_accessor :arguments
-    
+
     # Return all available commands
     def self.commands
       commands  = COMMANDS
       commands += LINUX_ONLY_COMMANDS if Thin.linux?
       commands
     end
-    
+
     def initialize(argv)
       @argv = argv
-      
+
       # Default options values
       @options = {
         :chdir                => Dir.pwd,
-        :environment          => 'development',
+        :environment          => ENV['RACK_ENV'] || 'development',
         :address              => '0.0.0.0',
         :port                 => Server::DEFAULT_PORT,
         :timeout              => Server::DEFAULT_TIMEOUT,
@@ -44,10 +44,10 @@ module Thin
         :require              => [],
         :wait                 => Controllers::Cluster::DEFAULT_WAIT_TIME
       }
-      
+
       parse!
     end
-    
+
     def parser
       # NOTE: If you add an option here make sure the key in the +options+ hash is the
       # same as the name of the command line option.
@@ -81,26 +81,26 @@ module Thin
 
         opts.separator ""
         opts.separator "Adapter options:"
-        opts.on("-e", "--environment ENV", "Framework environment " +                       
+        opts.on("-e", "--environment ENV", "Framework environment " +
                                            "(default: #{@options[:environment]})")      { |env| @options[:environment] = env }
         opts.on(      "--prefix PATH", "Mount the app under PATH (start with /)")       { |path| @options[:prefix] = path }
-        
+
         unless Thin.win? # Daemonizing not supported on Windows
           opts.separator ""
           opts.separator "Daemon options:"
-                                                                                      
+
           opts.on("-d", "--daemonize", "Run daemonized in the background")              { @options[:daemonize] = true }
-          opts.on("-l", "--log FILE", "File to redirect output " +                      
+          opts.on("-l", "--log FILE", "File to redirect output " +
                                       "(default: #{@options[:log]})")                   { |file| @options[:log] = file }
-          opts.on("-P", "--pid FILE", "File to store PID " +                            
+          opts.on("-P", "--pid FILE", "File to store PID " +
                                       "(default: #{@options[:pid]})")                   { |file| @options[:pid] = file }
           opts.on("-u", "--user NAME", "User to run daemon as (use with -g)")           { |user| @options[:user] = user }
           opts.on("-g", "--group NAME", "Group to run daemon as (use with -u)")         { |group| @options[:group] = group }
           opts.on(      "--tag NAME", "Additional text to display in process listing")  { |tag| @options[:tag] = tag }
-                                                                                      
+
           opts.separator ""
-          opts.separator "Cluster options:"                                             
-                                                                                      
+          opts.separator "Cluster options:"
+
           opts.on("-s", "--servers NUM", "Number of servers to start")                  { |num| @options[:servers] = num.to_i }
           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 }
@@ -108,12 +108,12 @@ module Thin
           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 ""
         opts.separator "Tuning options:"
-        
+
         opts.on("-b", "--backend CLASS", "Backend to use, full classname")              { |name| @options[:backend] = name }
-        opts.on("-t", "--timeout SEC", "Request or command timeout in sec " +            
+        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 open file descriptors " +
@@ -125,7 +125,7 @@ module Thin
         opts.on(      "--threaded", "Call the Rack application in threads " +
                                     "[experimental]")                                   { @options[:threaded] = true }
         opts.on(      "--no-epoll", "Disable the use of epoll")                         { @options[:no_epoll] = true } if Thin.linux?
-        
+
         opts.separator ""
         opts.separator "Common options:"
 
@@ -136,14 +136,14 @@ module Thin
         opts.on_tail('-v', '--version', "Show version")                                 { puts Thin::SERVER; exit }
       end
     end
-    
+
     # Parse the options.
     def parse!
       parser.parse! @argv
       @command   = @argv.shift
       @arguments = @argv
     end
-        
+
     # Parse the current shell arguments and run the command.
     # Exits on error.
     def run!
@@ -152,34 +152,34 @@ module Thin
       elsif @command.nil?
         puts "Command required"
         puts @parser
-        exit 1  
+        exit 1
       else
         abort "Unknown command: #{@command}. Use one of #{self.class.commands.join(', ')}"
       end
     end
-    
+
     # Send the command to the controller: single instance or cluster.
     def run_command
       load_options_from_config_file! unless CONFIGLESS_COMMANDS.include?(@command)
-      
+
       # PROGRAM_NAME is relative to the current directory, so make sure
       # we store and expand it before changing directory.
       Command.script = File.expand_path($PROGRAM_NAME)
-      
+
       # Change the current directory ASAP so that all relative paths are
       # relative to this one.
       Dir.chdir(@options[:chdir]) unless CONFIGLESS_COMMANDS.include?(@command)
-      
+
       @options[:require].each { |r| ruby_require r }
       Logging.debug = @options[:debug]
       Logging.trace = @options[:trace]
-      
+
       controller = case
       when cluster? then Controllers::Cluster.new(@options)
       when service? then Controllers::Service.new(@options)
       else               Controllers::Controller.new(@options)
       end
-      
+
       if controller.respond_to?(@command)
         begin
           controller.send(@command, *@arguments)
@@ -190,24 +190,24 @@ module Thin
         abort "Invalid options for command: #{@command}"
       end
     end
-    
+
     # +true+ if we're controlling a cluster.
     def cluster?
       @options[:only] || @options[:servers] || @options[:config]
     end
-    
+
     # +true+ if we're acting a as system service.
     def service?
       @options.has_key?(:all) || @command == 'install'
     end
-    
+
     private
       def load_options_from_config_file!
         if file = @options.delete(:config)
           YAML.load_file(file).each { |key, value| @options[key.to_sym] = value }
         end
       end
-      
+
       def ruby_require(file)
         if File.extname(file) == '.ru'
           warn 'WARNING: Use the -R option to load a Rack config file'