thin 1.5.1 → 1.6.0

data/lib/thin/request.rb

@@ -20,6 +20,7 @@ module Thin
     # Freeze some HTTP header names & values
     SERVER_SOFTWARE   = 'SERVER_SOFTWARE'.freeze
     SERVER_NAME       = 'SERVER_NAME'.freeze
+    REQUEST_METHOD    = 'REQUEST_METHOD'.freeze
     LOCALHOST         = 'localhost'.freeze
     HTTP_VERSION      = 'HTTP_VERSION'.freeze
     HTTP_1_0          = 'HTTP/1.0'.freeze
@@ -28,6 +29,7 @@ module Thin
     CONNECTION        = 'HTTP_CONNECTION'.freeze
     KEEP_ALIVE_REGEXP = /\bkeep-alive\b/i.freeze
     CLOSE_REGEXP      = /\bclose\b/i.freeze
+    HEAD              = 'HEAD'.freeze
     
     # Freeze some Rack header names
     RACK_INPUT        = 'rack.input'.freeze
@@ -128,7 +130,7 @@ module Thin
     def threaded=(value)
       @env[RACK_MULTITHREAD] = value
     end
-    
+
     def async_callback=(callback)
       @env[ASYNC_CALLBACK] = callback
       @env[ASYNC_CLOSE] = EventMachine::DefaultDeferrable.new
@@ -138,6 +140,10 @@ module Thin
       @async_close ||= @env[ASYNC_CLOSE]
     end
 
+    def head?
+      @env[REQUEST_METHOD] == HEAD
+    end
+
     # Close any resource used by the request
     def close
       @body.delete if @body.class == Tempfile

data/lib/thin/runner.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'optparse'
 require 'yaml'
 
@@ -37,12 +38,13 @@ module Thin
         :address              => '0.0.0.0',
         :port                 => Server::DEFAULT_PORT,
         :timeout              => Server::DEFAULT_TIMEOUT,
-        :log                  => 'log/thin.log',
+        :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
+        :wait                 => Controllers::Cluster::DEFAULT_WAIT_TIME,
+        :threadpool_size      => 20
       }
 
       parse!
@@ -124,6 +126,8 @@ module Thin
                                        "(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 ""
@@ -131,7 +135,7 @@ module Thin
 
         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", "Set debugging on")                               { @options[:debug] = 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 }
@@ -172,9 +176,22 @@ module Thin
       Dir.chdir(@options[:chdir]) unless CONFIGLESS_COMMANDS.include?(@command)
 
       @options[:require].each { |r| ruby_require r }
-      Logging.debug = @options[:debug]
-      Logging.trace = @options[:trace]
-      Logging.silent = @options[:quiet]
+
+      # Setup the logger
+      if @options[:quiet]
+        Logging.silent = true
+      else
+        logger           = Logger.new(STDOUT)
+        logger.level     = Logger::INFO
+        logger.level     = Logger::DEBUG if @options[:debug]
+        logger.formatter = Logging::SimpleFormatter.new
+        Logging.logger = logger
+      end
+
+      if @options[:trace]
+        # Trace raw requests/responses
+        Logging.trace_logger = Logging.logger
+      end
 
       controller = case
       when cluster? then Controllers::Cluster.new(@options)

data/lib/thin/server.rb

@@ -41,9 +41,12 @@ module Thin
   #   end
   #
   # == Controlling with signals
-  # * QUIT: Gracefull shutdown (see Server#stop)
   # * INT and TERM: Force shutdown (see Server#stop!)
-  # Disable signals by passing <tt>:signals => false</tt>
+  # * 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>.
   # 
   class Server
     include Logging
@@ -80,7 +83,7 @@ module Thin
     def_delegators :backend, :maximum_persistent_connections, :maximum_persistent_connections=
     
     # Allow using threads in the backend.
-    def_delegators :backend, :threaded?, :threaded=
+    def_delegators :backend, :threaded?, :threaded=, :threadpool_size, :threadpool_size=
     
     # Allow using SSL in the backend.
     def_delegators :backend, :ssl?, :ssl=, :ssl_options=
@@ -130,7 +133,7 @@ module Thin
       # If in debug mode, wrap in logger adapter
       @app = Rack::CommonLogger.new(@app) if Logging.debug?
       
-      setup_signals unless options[:signals].class == FalseClass
+      @setup_signals = options[:signals] != false
     end
     
     # Lil' shortcut to turn this:
@@ -149,14 +152,14 @@ module Thin
     def start
       raise ArgumentError, 'app required' unless @app
       
-      log   ">> Thin web server (v#{VERSION::STRING} codename #{VERSION::CODENAME})"
-      debug ">> Debugging ON"
-      trace ">> Tracing ON"
+      log_info  "Thin web server (v#{VERSION::STRING} codename #{VERSION::CODENAME})"
+      log_debug "Debugging ON"
+      trace     "Tracing ON"
       
-      log ">> Maximum connections set to #{@backend.maximum_connections}"
-      log ">> Listening on #{@backend}, CTRL+C to stop"
+      log_info "Maximum connections set to #{@backend.maximum_connections}"
+      log_info "Listening on #{@backend}, CTRL+C to stop"
       
-      @backend.start
+      @backend.start { setup_signals if @setup_signals }
     end
     alias :start! :start
     
@@ -169,8 +172,8 @@ module Thin
       if running?
         @backend.stop
         unless @backend.empty?
-          log ">> Waiting for #{@backend.size} connection(s) to finish, " +
-                 "can take up to #{timeout} sec, CTRL+C to stop now"
+          log_info "Waiting for #{@backend.size} connection(s) to finish, "\
+                   "can take up to #{timeout} sec, CTRL+C to stop now"
         end
       else
         stop!
@@ -182,7 +185,7 @@ module Thin
     # This doesn't wait for connection to finish their work and send data.
     # All current requests will be dropped.
     def stop!
-      log ">> Stopping ..."
+      log_info "Stopping ..."
 
       @backend.stop!
     end
@@ -192,7 +195,7 @@ module Thin
     def reopen_log
       return unless log_file
       file = File.expand_path(log_file)
-      log ">> Reopening log file: #{file}"
+      log_info "Reopening log file: #{file}"
       Daemonize.redirect_io(file)
     end
     
@@ -217,25 +220,36 @@ module Thin
       @backend.running?
     end
     
-    # deamonizing kills our HUP signal, so we set them again
-    def after_daemonize
-      setup_signals
-    end
-
     protected
-      # Register signals:
-      # * TERM & QUIT calls +stop+ to shutdown gracefully.
-      # * INT calls <tt>stop!</tt> to force shutdown.
-      # * HUP calls <tt>restart</tt> to ... surprise, restart!
-      # * USR1 reopen log files.
       def setup_signals
-        trap('INT')  { stop! }
-        trap('TERM') { stop }
-        unless Thin.win?
-          trap('QUIT') { stop }
-          trap('HUP')  { restart }
-          trap('USR1') { reopen_log }
+        # 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?
+
+        # Signals are processed at one second intervals.
+        @signal_timer ||= EM.add_periodic_timer(1) { handle_signals }
+      end
+
+      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)
@@ -261,10 +275,10 @@ module Thin
           begin
             require 'cgi_multipart_eof_fix'
           rescue LoadError
-            log "!! Ruby 1.8.5 is not secure please install cgi_multipart_eof_fix:"
-            log "   gem install cgi_multipart_eof_fix"
+            log_error "Ruby 1.8.5 is not secure please install cgi_multipart_eof_fix:"
+            log_error "gem install cgi_multipart_eof_fix"
           end
         end
       end
   end
-end
+end

data/lib/thin/stats.rb

@@ -49,4 +49,4 @@ module Thin
       end
     end
   end
-end
+end

data/lib/thin/version.rb

@@ -5,12 +5,12 @@ module Thin
   
   module VERSION #:nodoc:
     MAJOR    = 1
-    MINOR    = 5
-    TINY     = 1
+    MINOR    = 6
+    TINY     = 0
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Straight Razor".freeze
+    CODENAME = "Greek Yogurt".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: thin
 version: !ruby/object:Gem::Version
-  version: 1.5.1
-  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors:
 - Marc-Andre Cournoyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.6
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.9
 description: A thin and fast web server
@@ -118,27 +111,25 @@ files:
 homepage: http://code.macournoyer.com/thin/
 licenses:
 - Ruby
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.5
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: thin
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A thin and fast web server
 test_files: []
-has_rdoc: