thin 1.8.0 → 2.0.0.pre

data/lib/thin/runner.rb

@@ -1,238 +1,175 @@
-require 'logger'
-require 'optparse'
-require 'yaml'
-require 'erb'
+require "optparse"
+require "rack"
+
+require "thin/configurator"
 
 module Thin
-  # CLI runner.
-  # Parse options and send command to the correct Controller.
+  # Command line runner. Mimic Rack's +rackup+.
   class Runner
-    COMMANDS            = %w(start stop restart config)
-    LINUX_ONLY_COMMANDS = %w(install)
+    class OptionsParser
+      def parse!(args)
+        options = {}
+        opt_parser = OptionParser.new("", 24, '  ') do |opts|
+          opts.banner = "Usage: thin [ruby options] [thin options] [rackup config]"
 
-    # Commands that wont load options from the config file
-    CONFIGLESS_COMMANDS = %w(config install)
+          opts.separator ""
+          opts.separator "Ruby options:"
+
+          lineno = 1
+          opts.on("-e", "--eval LINE", "evaluate a LINE of code") { |line|
+            eval line, TOPLEVEL_BINDING, "-e", lineno
+            lineno += 1
+          }
+
+          opts.on("-d", "--debug", "set debugging flags (set $DEBUG to true)") {
+            $DEBUG = true
+          }
+          opts.on("-w", "--warn", "turn warnings on for your script") {
+            $-w = true
+          }
+
+          opts.on("-I", "--include PATH",
+                  "specify $LOAD_PATH (may be used more than once)") { |path|
+            $LOAD_PATH.unshift *path.split(":")
+          }
+
+          opts.on("-r", "--require LIBRARY",
+                  "require the library, before executing your script") { |library|
+            require library
+          }
 
-    # Parsed options
-    attr_accessor :options
+          opts.separator ""
+          opts.separator "Thin options:"
 
-    # Name of the command to be runned.
-    attr_accessor :command
+          opts.on("-o", "--host HOST", "bind to HOST") { |host|
+            options[:host] = host
+          }
 
-    # Arguments to be passed to the command.
-    attr_accessor :arguments
+          opts.on("-p", "--port PORT", "use PORT (default: 9292)") { |port|
+            options[:port] = port
+          }
 
-    # Return all available commands
-    def self.commands
-      commands  = COMMANDS
-      commands += LINUX_ONLY_COMMANDS if Thin.linux?
-      commands
-    end
+          opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e|
+            options[:environment] = e
+          }
 
-    def initialize(argv)
-      @argv = argv
-
-      # Default options values
-      @options = {
-        :chdir                => Dir.pwd,
-        :environment          => ENV['RACK_ENV'] || 'development',
-        :address              => '0.0.0.0',
-        :port                 => Server::DEFAULT_PORT,
-        :timeout              => Server::DEFAULT_TIMEOUT,
-        :log                  => File.join(Dir.pwd, 'log/thin.log'),
-        :pid                  => 'tmp/pids/thin.pid',
-        :max_conns            => Server::DEFAULT_MAXIMUM_CONNECTIONS,
-        :max_persistent_conns => Server::DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS,
-        :require              => [],
-        :wait                 => Controllers::Cluster::DEFAULT_WAIT_TIME,
-        :threadpool_size      => 20
-      }
+          opts.on("-D", "--daemonize", "run daemonized in the background") { |d|
+            options[:daemonize] = d ? true : false
+          }
 
-      parse!
-    end
+          opts.on("-P", "--pid FILE", "file to store PID (default: thin.pid)") { |f|
+            options[:pid] = ::File.expand_path(f)
+          }
 
-    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.
-      # +option+ keys are used to build the command line to launch other processes,
-      # see <tt>lib/thin/command.rb</tt>.
-      @parser ||= OptionParser.new do |opts|
-        opts.banner = "Usage: thin [options] #{self.class.commands.join('|')}"
-
-        opts.separator ""
-        opts.separator "Server options:"
-
-        opts.on("-a", "--address HOST", "bind to HOST address " +
-                                        "(default: #{@options[:address]})")             { |host| @options[:address] = host }
-        opts.on("-p", "--port PORT", "use PORT (default: #{@options[:port]})")          { |port| @options[:port] = port.to_i }
-        opts.on("-S", "--socket FILE", "bind to unix domain socket")                    { |file| @options[:socket] = file }
-        opts.on("-y", "--swiftiply [KEY]", "Run using swiftiply")                       { |key| @options[:swiftiply] = key }
-        opts.on("-A", "--adapter NAME", "Rack adapter to use (default: autodetect)",
-                                        "(#{Rack::ADAPTERS.map{|(a,b)|a}.join(', ')})") { |name| @options[:adapter] = name }
-        opts.on("-R", "--rackup FILE", "Load a Rack config file instead of " +
-                                       "Rack adapter")                                  { |file| @options[:rackup] = file }
-        opts.on("-c", "--chdir DIR", "Change to dir before starting")                   { |dir| @options[:chdir] = File.expand_path(dir) }
-        opts.on(      "--stats PATH", "Mount the Stats adapter under PATH")             { |path| @options[:stats] = path }
-
-        opts.separator ""
-        opts.separator "SSL options:"
-
-        opts.on(      "--ssl", "Enables SSL")                                           { @options[:ssl] = true }
-        opts.on(      "--ssl-key-file PATH", "Path to private key")                     { |path| @options[:ssl_key_file] = path }
-        opts.on(      "--ssl-cert-file PATH", "Path to certificate")                    { |path| @options[:ssl_cert_file] = path }
-        opts.on(      "--ssl-disable-verify", "Disables (optional) client cert requests") { @options[:ssl_disable_verify] = true }
-        opts.on(      "--ssl-version VERSION", "TLSv1, TLSv1_1, TLSv1_2")               { |version| @options[:ssl_version] = version }
-        opts.on(      "--ssl-cipher-list STRING", "Example: HIGH:!ADH:!RC4:-MEDIUM:-LOW:-EXP:-CAMELLIA") { |cipher| @options[:ssl_cipher_list] = cipher }
-
-        opts.separator ""
-        opts.separator "Adapter options:"
-        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("-l", "--log FILE", "file to log to (default: stdout)") { |f|
+            options[:log] = ::File.expand_path(f)
+          }
 
-          opts.on("-d", "--daemonize", "Run daemonized in the background")              { @options[:daemonize] = true }
-          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 " +
-                                      "(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.on("-c", "--config FILE", "Thin configuration file.") { |file|
+            options[:thin_config] = file
+          }
 
           opts.separator ""
-          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 }
-          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 }
+          opts.separator "Common options:"
+
+          opts.on_tail("-h", "-?", "--help", "Show this message") do
+            puts opts
+            exit
+          end
+
+          opts.on_tail("--version", "Show version") do
+            puts Thin::SERVER
+            exit
+          end
         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 " +
-                                       "(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 " +
-                                         "(default: #{@options[:max_conns]})",
-                                         "Might require sudo to set higher than 1024")  { |num| @options[:max_conns] = num.to_i } unless Thin.win?
-        opts.on(      "--max-persistent-conns NUM",
-                                       "Maximum number of persistent connections",
-                                       "(default: #{@options[:max_persistent_conns]})") { |num| @options[:max_persistent_conns] = num.to_i }
-        opts.on(      "--threaded", "Call the Rack application in threads " +
-                                    "[experimental]")                                   { @options[:threaded] = true }
-        opts.on(      "--threadpool-size NUM", "Sets the size of the EventMachine threadpool.",
-                                       "(default: #{@options[:threadpool_size]})") { |num| @options[:threadpool_size] = num.to_i }
-        opts.on(      "--no-epoll", "Disable the use of epoll")                         { @options[:no_epoll] = true } if Thin.linux?
-
-        opts.separator ""
-        opts.separator "Common options:"
-
-        opts.on_tail("-r", "--require FILE", "require the library")                     { |file| @options[:require] << file }
-        opts.on_tail("-q", "--quiet", "Silence all logging")                            { @options[:quiet] = true }
-        opts.on_tail("-D", "--debug", "Enable debug logging")                           { @options[:debug] = true }
-        opts.on_tail("-V", "--trace", "Set tracing on (log raw request/response)")      { @options[:trace] = true }
-        opts.on_tail("-h", "--help", "Show this message")                               { puts opts; exit }
-        opts.on_tail('-v', '--version', "Show version")                                 { puts Thin::SERVER; exit }
-      end
-    end
+        begin
+          opt_parser.parse! args
+        rescue OptionParser::InvalidOption => e
+          warn e.message
+          abort opt_parser.to_s
+        end
 
-    # Parse the options.
-    def parse!
-      parser.parse! @argv
-      @command   = @argv.shift
-      @arguments = @argv
-    end
+        options[:config] = args.last if args.last
 
-    # Parse the current shell arguments and run the command.
-    # Exits on error.
-    def run!
-      if self.class.commands.include?(@command)
-        run_command
-      elsif @command.nil?
-        puts "Command required"
-        puts @parser
-        exit 1
-      else
-        abort "Unknown command: #{@command}. Use one of #{self.class.commands.join(', ')}"
+        options
       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)
+    def default_options
+      {
+        :environment => ENV['RACK_ENV'] || "development",
+        :port        => 9292,
+        :config      => "config.ru"
+      }
+    end
 
-      # Change the current directory ASAP so that all relative paths are
-      # relative to this one.
-      Dir.chdir(@options[:chdir]) unless CONFIGLESS_COMMANDS.include?(@command)
+    def run(args)
+      options = default_options.dup
 
-      @options[:require].each { |r| ruby_require r }
+      parser = OptionsParser.new
+      options.update parser.parse!(args)
 
-      # Setup the logger
-      if @options[:quiet]
-        Logging.silent = true
-      else
-        Logging.level = Logger::DEBUG if @options[:debug]
+      # Parse in file options like rackup
+      shebang = File.open(options[:config]) { |f| f.readline }
+      if shebang[/^#\\(.*)/]
+        options.update parser.parse! $1.split(/\s+/)
       end
 
-      if @options[:trace]
-        # Trace raw requests/responses
-        Logging.trace_logger = Logging.logger
+      ENV["RACK_ENV"] = options[:environment]
+      options[:config] = ::File.expand_path(options[:config])
+
+      # Configure the server
+      server = Server.new do
+        # This is passed as a block so it can be loaded inside workers if preload_app disabled.
+        build_app(options[:config], options[:environment])
       end
 
-      controller = case
-      when cluster? then Controllers::Cluster.new(@options)
-      when service? then Controllers::Service.new(@options)
-      else               Controllers::Controller.new(@options)
+      if options[:thin_config]
+        Configurator.load(options[:thin_config]).apply(server)
       end
 
-      if controller.respond_to?(@command)
-        begin
-          controller.send(@command, *@arguments)
-        rescue RunnerError => e
-          abort e.message
-        end
-      else
-        abort "Invalid options for command: #{@command}"
+      # If no listeners yet, use the one from the options
+      if !options.has_key?(:thin_config) || server.listeners.empty?
+        server.listen [options[:host], options[:port]].compact.join(":")
       end
-    end
 
-    # +true+ if we're controlling a cluster.
-    def cluster?
-      @options[:only] || @options[:servers] || @options[:config]
+      server.pid_path = options[:pid] if options[:pid]
+      server.log_path = options[:log] if options[:log]
+      server.worker_processes = options[:workers] if options[:workers]
+      server.timeout = options[:timeout] if options[:timeout]
+
+      # Start the server
+      server.start(options[:daemonize])
     end
 
-    # +true+ if we're acting a as system service.
-    def service?
-      @options.has_key?(:all) || @command == 'install'
+    def self.run(args)
+      new.run(args)
     end
 
     private
-      def load_options_from_config_file!
-        if file = @options.delete(:config)
-          YAML.load(ERB.new(File.read(file)).result).each { |key, value| @options[key.to_sym] = value }
-        end
+      def build_app(config, environment)
+        inner_app = Rack::Builder.parse_file(config).first
+        
+        Rack::Builder.new do
+          case environment
+          when "development"
+            use Rack::ContentLength
+            use Rack::Chunked
+            use Rack::CommonLogger
+            use Rack::ShowExceptions
+            use Rack::Lint
+
+          when "deployment"
+            use Rack::ContentLength
+            use Rack::Chunked
+            use Rack::CommonLogger
+
+          end
+
+          run inner_app
+        end.to_app
       end
 
-      def ruby_require(file)
-        if File.extname(file) == '.ru'
-          warn 'WARNING: Use the -R option to load a Rack config file'
-          @options[:rackup] = file
-        else
-          require file
-        end
-      end
   end
 end

data/lib/thin/server.rb

@@ -1,290 +1,241 @@
+require "eventmachine"
+
+require "thin/system"
+require "thin/listener"
+require "thin/connection"
+require "thin/backends/prefork"
+require "thin/backends/single_process"
+
 module Thin
-  # The utterly famous Thin HTTP server.
-  # It listens for incoming requests through a given +backend+
-  # and forwards all requests to +app+.
-  #
-  # == TCP server
-  # Create a new TCP server bound to <tt>host:port</tt> by specifiying +host+
-  # and +port+ as the first 2 arguments.
+  # The uterly famous Thin server.
   #
-  #   Thin::Server.start('0.0.0.0', 3000, app)
+  # == Listening
+  # Create and start a new server listenting on port 3000 and forwarding all requests to +app+.
   #
-  # == UNIX domain server
-  # Create a new UNIX domain socket bound to +socket+ file by specifiying a filename
-  # as the first argument. Eg.: /tmp/thin.sock. If the first argument contains a <tt>/</tt>
-  # it will be assumed to be a UNIX socket. 
+  #   server = Thin::Server.new(app)
+  #   server.listen 3000
+  #   server.start
   #
-  #   Thin::Server.start('/tmp/thin.sock', app)
+  # == Preforking and workers
+  # If fork(2) is available on your system, Thin will try to start workers to process requests.
+  # By default the number of workers will be based on the number of processors on your system.
+  # Configure this using the +worker_processes+ attribute.
+  # However, if fork(2) or if +worker_processes+ if equal to +0+, Thin will run in a single process
+  # with limited features.
   #
-  # == Using a custom backend
-  # You can implement your own way to connect the server to its client by creating your
-  # own Backend class and passing it as the :backend option.
+  # == Single process mode
+  # In this mode, Thin features will be limited:
+  # - no log files
+  # - no signal handling (only exits on INT).
   #
-  #   Thin::Server.start('galaxy://faraway', 1345, app, :backend => Thin::Backends::MyFancyBackend)
+  # This mode is only intended as a fallback for systems with no fork(2) system call.
   #
-  # == Rack application (+app+)
-  # All requests will be processed through +app+, which must be a valid Rack adapter.
-  # A valid Rack adapter (application) must respond to <tt>call(env#Hash)</tt> and
-  # return an array of <tt>[status, headers, body]</tt>.
-  #
-  # == Building an app in place
-  # If a block is passed, a <tt>Rack::Builder</tt> instance
-  # will be passed to build the +app+. So you can do cool stuff like this:
-  # 
-  #   Thin::Server.start('0.0.0.0', 3000) do
-  #     use Rack::CommonLogger
-  #     use Rack::ShowExceptions
-  #     map "/lobster" do
-  #       use Rack::Lint
-  #       run Rack::Lobster.new
-  #     end
-  #   end
+  # You can force this mode by setting +worker_processes+ to +0+.
   #
   # == Controlling with signals
-  # * INT and TERM: Force shutdown (see Server#stop!)
-  # * TERM & QUIT calls +stop+ to shutdown gracefully.
-  # * HUP calls +restart+ to ... surprise, restart!
-  # * USR1 reopen log files.
-  # Signals are processed at one second intervals.
-  # Disable signals by passing <tt>:signals => false</tt>.
-  # 
+  # - *WINCH*: Gracefully kill all workers but keep master alive
+  # - *TTIN*: Increase number of workers
+  # - *TTOU*: Decrease number of workers
+  # - *QUIT*: Kill workers and master in a graceful way
+  # - *TERM*, *INT*: Kill workers and master immediately
   class Server
-    include Logging
-    include Daemonizable
-    extend  Forwardable
+    # Application called with the request that produces the response.
+    attr_reader :app
     
-    # Default values
-    DEFAULT_TIMEOUT                        = 30 #sec
-    DEFAULT_HOST                           = '0.0.0.0'
-    DEFAULT_PORT                           = 3000
-    DEFAULT_MAXIMUM_CONNECTIONS            = 1024
-    DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS = 100
-        
-    # Application (Rack adapter) called with the request that produces the response.
-    attr_accessor :app
+    # Set to +true+ to load the app before forking to workers.
+    # Default: false
+    attr_accessor :preload_app
 
     # A tag that will show in the process listing
     attr_accessor :tag
 
-    # Backend handling the connections to the clients.
-    attr_accessor :backend
-    
-    # Maximum number of seconds for incoming data to arrive before the connection
-    # is dropped.
-    def_delegators :backend, :timeout, :timeout=
-    
-    # Maximum number of file or socket descriptors that the server may open.
-    def_delegators :backend, :maximum_connections, :maximum_connections=
-    
-    # Maximum number of connections that can be persistent at the same time.
-    # Most browsers never close the connection so most of the time they are closed
-    # when the timeout occurs. If we don't control the number of persistent connections,
-    # it would be very easy to overflow the server for a DoS attack.
-    def_delegators :backend, :maximum_persistent_connections, :maximum_persistent_connections=
-    
-    # Allow using threads in the backend.
-    def_delegators :backend, :threaded?, :threaded=, :threadpool_size, :threadpool_size=
-    
-    # Allow using SSL in the backend.
-    def_delegators :backend, :ssl?, :ssl=, :ssl_options=
-    
-    # Address and port on which the server is listening for connections.
-    def_delegators :backend, :host, :port
-    
-    # UNIX domain socket on which the server is listening for connections.
-    def_delegator :backend, :socket
-    
-    # Disable the use of epoll under Linux
-    def_delegators :backend, :no_epoll, :no_epoll=
+    # Number of child worker processes.
+    # Setting this to 0 will result in running in a single process with limited features.
+    # Default: number of processors available, or 1 in development, or 0 if +fork+ is not available.
+    attr_accessor :worker_processes
+
+    # Maximum number of file descriptors that the worker may open.
+    # Default: 1024
+    attr_accessor :worker_connections
+
+    # Set to +true+ to call +app+ in a thread.
+    # Default: false
+    attr_accessor :threaded
+
+    # Size of the pool of threads used to call the +app+.
+    # Default: 20
+    attr_accessor :thread_pool_size
+
+    # Workers are killed if they don't check-in under +timeout+ seconds.
+    # Default: 30
+    attr_accessor :timeout
     
-    def initialize(*args, &block)
-      host, port, options = DEFAULT_HOST, DEFAULT_PORT, {}
+    # Maximum number of concurrent requests which can be made over a keep-alive connection.
+    # Default: 100
+    attr_accessor :max_keep_alive_requests
+
+    # Path to the file in which the PID is saved.
+    # Default: ./thin.pid
+    attr_accessor :pid_path
+
+    # Path to the file in which standard output streams are redirected.
+    # Default: none, outputs to stdout
+    attr_accessor :log_path
+
+    # Set to +true+ to use epoll event model.
+    attr_accessor :use_epoll
+
+    # Set to +true+ to use kqueue event model.
+    attr_accessor :use_kqueue
+
+    # Set the backend handling the connections to the clients.
+    attr_writer :backend
+
+    # Listeners currently registered on this server.
+    # @see Thin::Listener
+    attr_accessor :listeners
+
+    # Object that is +call+ed before forking a worker process inside the master process.
+    attr_accessor :before_fork
+
+    # Object that is +call+ed after forking a worker process inside the worker process.
+    attr_accessor :after_fork
+
+    # Creates a new server that will forward requests to the app returned when +call+ing the +app_loader+ block.
+    # When +preload_app+ is set to +true+, +app_loader+ will be called before forking.
+    # When +preload_app+ is set to +false+, +app_loader+ will be called after forking.
+    # +host+, +port+ and +app+ supported for backward compatibility with Rack adapter.
+    def initialize(host=nil, port=nil, app=nil, &app_loader)
+      app_loader = proc { app } if app
+      @app_loader = app_loader || raise(ArgumentError, "app_loader block required")
       
-      # Guess each parameter by its type so they can be
-      # received in any order.
-      args.each do |arg|
-        case arg
-        when 0.class, /^\d+$/ then port    = arg.to_i
-        when String           then host    = arg
-        when Hash             then options = arg
+      # Set defaults
+      @preload_app = false
+      @timeout = 30
+      @pid_path = "./thin.pid"
+      @log_path = nil
+      @worker_connections = 1024
+      @threaded = false
+      @thread_pool_size = 20
+      @max_keep_alive_requests = 100
+      @keep_alive_requests = 0
+      @connections = 0 # Number of active connections
+
+      if System.supports_fork?
+        if ENV["RACK_ENV"] == "development"
+          # Default to one worker in development.
+          @worker_processes = 1
         else
-          @app = arg if arg.respond_to?(:call)
+          # One worker per processor in production.
+          @worker_processes = System.processor_count
         end
+      else
+        # No workers, runs in a single process.
+        @worker_processes = 0
       end
-      
-      # Set tag if needed
-      self.tag = options[:tag]
 
-      # Try to intelligently select which backend to use.
-      @backend = select_backend(host, port, options)
-      
-      load_cgi_multipart_eof_fix
+      @listeners = []
       
-      @backend.server = self
-      
-      # Set defaults
-      @backend.maximum_connections            = DEFAULT_MAXIMUM_CONNECTIONS
-      @backend.maximum_persistent_connections = DEFAULT_MAXIMUM_PERSISTENT_CONNECTIONS
-      @backend.timeout                        = options[:timeout] || DEFAULT_TIMEOUT
-      
-      # Allow using Rack builder as a block
-      @app = Rack::Builder.new(&block).to_app if block
-      
-      # If in debug mode, wrap in logger adapter
-      @app = Rack::CommonLogger.new(@app) if Logging.debug?
-      
-      @setup_signals = options[:signals] != false
+      listen "#{host}:#{port}" if host && port
     end
-    
-    # Lil' shortcut to turn this:
-    # 
-    #   Server.new(...).start
-    # 
-    # into this:
-    # 
-    #   Server.start(...)
-    # 
-    def self.start(*args, &block)
-      new(*args, &block).start!
-    end
-        
-    # Start the server and listen for connections.
-    def start
-      raise ArgumentError, 'app required' unless @app
-      
-      log_info  "Thin web server (v#{VERSION::STRING} codename #{VERSION::CODENAME})"
-      log_debug "Debugging ON"
-      trace     "Tracing ON"
-      
-      log_info "Maximum connections set to #{@backend.maximum_connections}"
-      log_info "Listening on #{@backend}, CTRL+C to stop"
 
-      @backend.start { setup_signals if @setup_signals }
-    end
-    alias :start! :start
-    
-    # == Gracefull shutdown
-    # Stops the server after processing all current connections.
-    # As soon as this method is called, the server stops accepting
-    # new requests and waits for all current connections to finish.
-    # Calling twice is the equivalent of calling <tt>stop!</tt>.
-    def stop
-      if running?
-        @backend.stop
-        unless @backend.empty?
-          log_info "Waiting for #{@backend.size} connection(s) to finish, "\
-                   "can take up to #{timeout} sec, CTRL+C to stop now"
+    # Backend handling connections to the clients.
+    def backend
+      @backend ||= begin
+        if prefork?
+          Backends::Prefork.new(self)
+        else
+          Backends::SingleProcess.new(self)
         end
-      else
-        stop!
       end
     end
     
-    # == Force shutdown
-    # Stops the server closing all current connections right away.
-    # This doesn't wait for connection to finish their work and send data.
-    # All current requests will be dropped.
-    def stop!
-      if @backend.started_reactor?
-        log_info "Stopping ..."
-      else
-        log_info "Stopping Thin ..."
-        log_info "Thin was started inside an existing EventMachine.run block."
-        log_info "Call `EventMachine.stop` to stop the reactor and quit the process."
-      end
-
-      @backend.stop!
-    end
-    
-    # == Reopen log file.
-    # Reopen the log file and redirect STDOUT and STDERR to it.
-    def reopen_log
-      return unless log_file
-      file = File.expand_path(log_file)
-      log_info "Reopening log file: #{file}"
-      Daemonize.redirect_io(file)
+    # Listen for incoming connections on +address+.
+    # @example
+    #   listen 3000 # port number
+    #   listen "0.0.0.0:8008", :backlog => 80
+    #   listen "[::]:8008", :ipv6_only => true
+    #   listen "/tmp/thin.sock"
+    # @param address [String, Integer] address to listen on. Can be a port number of host:port.
+    # @option options [Boolean] :tcp_no_delay (true) Disables the Nagle algorithm for send coalescing.
+    # @option options [Boolean] :ipv6_only (false) do not listen on IPv4 interface.
+    # @option options [Integer] :backlog (1024) Maximum number of clients in the listening backlog.
+    def listen(address, options={})
+      @listeners << Listener.new(address, options)
     end
-    
-    # == Configure the server
-    # The process might need to have superuser privilege to configure
-    # server with optimal options.
-    def config
-      @backend.config
-    end
-    
-    # Name of the server and type of backend used.
-    # This is also the name of the process in which Thin is running as a daemon.
-    def name
-      "thin server (#{@backend})" + (tag ? " [#{tag}]" : "")
-    end
-    alias :to_s :name
-    
-    # Return +true+ if the server is running and ready to receive requests.
-    # Note that the server might still be running and return +false+ when
-    # shuting down and waiting for active connections to complete.
-    def running?
-      @backend.running?
-    end
-    
-    protected
-      def setup_signals
-        # Queue up signals so they are processed in non-trap context
-        # using a EM timer.
-        @signal_queue ||= []
 
-        %w( INT TERM ).each do |signal|
-          trap(signal) { @signal_queue.push signal }
-        end
-        # *nix only signals
-        %w( QUIT HUP USR1 ).each do |signal|
-          trap(signal) { @signal_queue.push signal }
-        end unless Thin.win?
+    # Starts the server and open a listening socket for each +listeners+.
+    # @param daemonize Daemonize the process after starting.
+    def start(daemonize=false)
+      puts "Starting #{to_s} ..."
 
-        # Signals are processed at one second intervals.
-        @signal_timer ||= EM.add_periodic_timer(1) { handle_signals }
-      end
+      # Configure EventMachine
+      EM.epoll = @use_epoll unless @use_epoll.nil?
+      EM.kqueue = @use_kqueue unless @use_kqueue.nil?
+      @worker_connections = EM.set_descriptor_table_size(@worker_connections)
+      EM.threadpool_size = @thread_pool_size
 
-      def handle_signals
-        case @signal_queue.shift
-        when 'INT'
-          stop!
-        when 'TERM', 'QUIT'
-          stop
-        when 'HUP'
-          restart
-        when 'USR1'
-          reopen_log
-        end
-        EM.next_tick { handle_signals } unless @signal_queue.empty?
-      end
-      
-      def select_backend(host, port, options)
-        case
-        when options.has_key?(:backend)
-          raise ArgumentError, ":backend must be a class" unless options[:backend].is_a?(Class)
-          options[:backend].new(host, port, options)
-        when options.has_key?(:swiftiply)
-          Backends::SwiftiplyClient.new(host, port, options)
-        when host.include?('/')
-          Backends::UnixServer.new(host)
-        else
-          Backends::TcpServer.new(host, port)
-        end
+      # Preload the app in the master process.
+      @app = @app_loader.call if @preload_app
+
+      @listeners.each do |listener|
+        puts "Listening with #{listener}"
+        listener.listen
       end
-      
-      # Taken from Mongrel cgi_multipart_eof_fix
-      # Ruby 1.8.5 has a security bug in cgi.rb, we need to patch it.
-      def load_cgi_multipart_eof_fix
-        version = RUBY_VERSION.split('.').map { |i| i.to_i }
-        
-        if version[0] <= 1 && version[1] <= 8 && version[2] <= 5 && RUBY_PLATFORM !~ /java/
-          begin
-            require 'cgi_multipart_eof_fix'
-          rescue LoadError
-            log_error "Ruby 1.8.5 is not secure please install cgi_multipart_eof_fix:"
-            log_error "gem install cgi_multipart_eof_fix"
+      puts "CTRL+C to stop"
+
+      backend.start(daemonize) do
+        # Load the app in the worker process if it was not preloaded.
+        @app = @app_loader.call unless @preload_app
+
+        @listeners.each do |listener|
+          EM.attach_server(listener.socket, Connection) do |connection|
+            connection.comm_inactivity_timeout = @timeout
+            connection.server = self
+            connection.listener = listener
+            
+            # We control the number of keep-alive connections to prevent easy DDoS attacks.
+            if @keep_alive_requests < @max_keep_alive_requests
+              connection.can_keep_alive = true
+              @keep_alive_requests += 1
+            else
+              connection.can_keep_alive = false
+            end
+            
+            @connections += 1
+            
+            # Decrement counters on close
+            connection.on_close do
+              @keep_alive_requests -= 1 if connection.can_keep_alive
+              @connections -= 1
+            end
           end
         end
       end
+    rescue
+      stop
+      raise
+    end
+
+    # Stops the server and close all listeners.
+    def stop
+      puts "Stopping ..."
+      @listeners.each { |listener| listener.close }
+    end
+    alias :shutdown :stop
+
+    # Returns +true+ if the server will fork workers or +false+ if it will run in a single process.
+    def prefork?
+      @worker_processes > 0
+    end
+    
+    def threaded?
+      @threaded
+    end
+
+    # Procline of the process when the server is running.
+    def to_s
+      "Thin" + (@tag ? " [#{@tag}]" : "")
+    end
   end
 end