thin 0.6.1-x86-mswin32-60 → 0.6.2-x86-mswin32-60

data/lib/thin/headers.rb

@@ -10,8 +10,11 @@ module Thin
       @out = ''
     end
     
+    # Add <tt>key: value</tt> pair to the headers.
+    # Ignore if already sent and no duplicates are allowed
+    # for this +key+.
     def []=(key, value)
-      if !@sent[key] || ALLOWED_DUPLICATES.include?(key)
+      if !@sent.has_key?(key) || ALLOWED_DUPLICATES.include?(key)
         @sent[key] = true
         @out << HEADER_FORMAT % [key, value]
       end

data/lib/thin/logging.rb

@@ -16,6 +16,7 @@ module Thin
         puts msg || yield if ($DEBUG || $TRACE) && !@silent
       end
       
+      # Log an error backtrace if tracing is activated
       def log_error(e)
         trace { "#{e}\n\t" + e.backtrace.join("\n\t") }
       end

data/lib/thin/request.rb

@@ -62,21 +62,27 @@ module Thin
     def parse(data)
       @data << data
       
-      if @parser.finished?                    # Header finished, can only be some more body
-        body << data
-      else                                    # Parse more header using the super parser
+      if @parser.finished?  # Header finished, can only be some more body
+        body << data        
+      else                  # Parse more header using the super parser
         @nparsed = @parser.execute(@env, @data, @nparsed)
+
         # Transfert to a tempfile if body is very big
         move_body_to_tempfile if @parser.finished? && content_length > MAX_BODY
       end
       
-      # Check if header and body are complete
-      if @parser.finished? && @body.size >= content_length
-        @body.rewind
-        return true # Request is fully parsed
-      end
       
-      false # Not finished, need more data
+      if finished?   # Check if header and body are complete
+        @body.rewind  
+        true         # Request is fully parsed
+      else            
+        false        # Not finished, need more data
+      end
+    end
+    
+    # +true+ if headers and body are finished parsing
+    def finished?
+      @parser.finished? && @body.size >= content_length
     end
     
     # Expected size of the body
@@ -84,18 +90,19 @@ module Thin
       @env[CONTENT_LENGTH].to_i
     end
     
+    # Close any resource used by the response
     def close
-      @body.close if @body === Tempfile
-    end
-    
+      @body.delete if @body.class == Tempfile
+    end    
     
     private
       def move_body_to_tempfile
         current_body = @body
+        current_body.rewind
         @body = Tempfile.new(BODY_TMPFILE)
         @body.binmode
-        @body << current_body unless current_body.size.zero?
-        @env[RACK_INPUT] = @body
+        @body << current_body.read
+        @env[RACK_INPUT] = @body        
       end
   end  
 end

data/lib/thin/response.rb

@@ -1,9 +1,9 @@
 module Thin
   # A response sent to the client.
   class Response
-    CONNECTION     = 'Connection'.freeze
-    SERVER         = 'Server'.freeze
-    CLOSE          = 'close'.freeze
+    CONNECTION = 'Connection'.freeze
+    SERVER     = 'Server'.freeze
+    CLOSE      = 'close'.freeze
     
     # Status code
     attr_accessor :status
@@ -23,7 +23,7 @@ module Thin
     # to be sent in the response.
     def headers_output
       @headers[CONNECTION] = CLOSE
-      @headers[SERVER] = Thin::SERVER
+      @headers[SERVER]     = Thin::SERVER
       
       @headers.to_s
     end
@@ -34,10 +34,33 @@ module Thin
       "HTTP/1.1 #{@status} #{HTTP_STATUS_CODES[@status.to_i]}\r\n#{headers_output}\r\n"
     end
     
-    def headers=(key_value_pairs)
-      key_value_pairs.each do |k, vs|
-        vs.each_line { |v| @headers[k] = v.chomp }
+    if Thin.ruby_18?
+      
+      # Ruby 1.8 implementation.
+      # Respects Rack specs.
+      def headers=(key_value_pairs)
+        key_value_pairs.each do |k, vs|
+          vs.each { |v| @headers[k] = v.chomp }
+        end
       end
+
+    else
+
+      # Ruby 1.9 doesn't have a String#each anymore.
+      # Rack spec doesn't take care of that yet, for now we just use
+      # +each+ but fallback to +each_line+ on strings.
+      # I wish we could remove that condition.
+      # To be reviewed when a new Rack spec comes out.
+      def headers=(key_value_pairs)
+        key_value_pairs.each do |k, vs|
+          if vs.is_a?(String)
+            vs.each_line { |v| @headers[k] = v.chomp }
+          else
+            vs.each { |v| @headers[k] = v.chomp }
+          end
+        end
+      end      
+
     end
     
     # Close any resource used by the response

data/lib/thin/server.rb

@@ -1,7 +1,4 @@
 module Thin
-  # Raise when we require the server to stop
-  class StopServer < Exception; end
-  
   # The Thin HTTP server used to served request.
   # It listen for incoming request on a given port
   # and forward all request to +app+.
@@ -42,13 +39,14 @@ module Thin
     #
     def initialize(host_or_socket, port=3000, app=nil, &block)
       if host_or_socket.include?('/')
-        @socket = host_or_socket
+        @socket    = host_or_socket
       else      
-        @host   = host_or_socket
-        @port   = port.to_i
+        @host      = host_or_socket
+        @port      = port.to_i
       end       
-      @app      = app
-      @timeout  = 60 # sec
+      @app         = app
+      @timeout     = 60 # sec
+      @connections = []
       
       @app = Rack::Builder.new(&block).to_app if block
     end
@@ -72,27 +70,40 @@ module Thin
       log   ">> Thin web server (v#{VERSION::STRING} codename #{VERSION::CODENAME})"
       trace ">> Tracing ON"
       
-      EventMachine.run do
-        begin
-          start_server
-        rescue StopServer
-          stop
-        end
-      end
+      EventMachine.run { @signature = start_server }
     end
     alias :start! :start
     
-    # Stops the server by stopping the listening loop.
+    # Stops the server after processing all current connections.
+    # Calling twice is the equivalent of calling <tt>stop!</tt>.
     def stop
-      EventMachine.stop_event_loop
-      remove_socket_file
-    rescue
-      warn "Error stopping : #{$!}"
+      if @stopping
+        stop!
+      else
+        @stopping = true
+        
+        # Do not accept anymore connection
+        EventMachine.stop_server(@signature)
+        
+        unless wait_for_connections_and_stop
+          # Still some connections running, schedule a check later
+          EventMachine.add_periodic_timer(1) { wait_for_connections_and_stop }
+        end
+      end
     end
     
-    # Stops the server by raising an error.
+    # Stops the server closing all current connections
     def stop!
-      raise StopServer
+      log ">> Stopping ..."
+
+      @connections.each { |connection| connection.close_connection }
+      EventMachine.stop
+
+      remove_socket_file
+    end
+    
+    def connection_finished(connection)
+      @connections.delete(connection)
     end
     
     protected
@@ -110,19 +121,34 @@ module Thin
       end
       
       def start_server_on_socket
+        raise PlatformNotSupported, 'UNIX sockets not available on Windows' if Thin.win?
+        
         log ">> Listening on #{@socket}, CTRL+C to stop"
         EventMachine.start_unix_domain_server(@socket, Connection, &method(:initialize_connection))
       end
       
       def initialize_connection(connection)
+        connection.server                  = self
         connection.comm_inactivity_timeout = @timeout
         connection.app                     = @app
         connection.silent                  = @silent
         connection.unix_socket             = !@socket.nil?
+
+        @connections << connection
       end
       
       def remove_socket_file
         File.delete(@socket) if @socket && File.exist?(@socket)
       end
+      
+      def wait_for_connections_and_stop
+        if @connections.empty?
+          stop!
+          true
+        else
+          log ">> Waiting for #{@connections.size} connection(s) to finish, CTRL+C to force stop"
+          false
+        end
+      end
   end
 end

data/lib/thin/stats.rb

@@ -1,10 +1,16 @@
+require 'erb'
+
 module Thin
-  # Rack adapter to log stats to a Rack application
   module Stats
+    # Rack adapter to log stats about a Rack application.
     class Adapter
+      include ERB::Util
+      
       def initialize(app, path='/stats')
         @app  = app
         @path = path
+
+        @template = ERB.new(TEMPLATE)
         
         @requests          = 0
         @requests_finished = 0
@@ -21,34 +27,19 @@ module Thin
       
       def log(env)
         @requests += 1
-        @server = env['SERVER_SOFTWARE']
+        @last_request = Rack::Request.new(env)
         request_started_at = Time.now
         
         response = yield
         
         @requests_finished += 1
-        @last_request_path = env['PATH_INFO']
         @last_request_time = Time.now - request_started_at
         
         response
       end
       
       def serve(env)
-        body = '<html><body>'
-        body << '<h1>Server stats</h1>'
-        body << '<ul>'
-        body << "<li>#{@requests} requests</li>"
-        body << "<li>#{@requests_finished} requests finished</li>"
-        body << "<li>#{@requests - @requests_finished} errors</li>"
-        body << "<li>#{Time.now - @start_time} uptime</li>"
-        body << "<li>Running on #{@server}</li>"
-        body << '</ul>'
-        body << '<h2>Last request</h2>'
-        body << '<ul>'
-        body << "<li>#{@last_request_path}</li>"
-        body << "<li>Took #{@last_request_time} sec</li>"
-        body << '</ul>'
-        body << '</body></html>'
+        body = @template.result(binding)
         
         [
           200,
@@ -56,9 +47,257 @@ module Thin
             'Content-Type' => 'text/html',
             'Content-Length' => body.size.to_s
           },
-          body
+          [body]
         ]
       end
+      
+      # Taken from Rails
+      def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
+        from_time = from_time.to_time if from_time.respond_to?(:to_time)
+        to_time = to_time.to_time if to_time.respond_to?(:to_time)
+        distance_in_minutes = (((to_time - from_time).abs)/60).round
+        distance_in_seconds = ((to_time - from_time).abs).round
+
+        case distance_in_minutes
+          when 0..1
+            return (distance_in_minutes == 0) ? 'less than a minute' : '1 minute' unless include_seconds
+            case distance_in_seconds
+              when 0..4   then 'less than 5 seconds'
+              when 5..9   then 'less than 10 seconds'
+              when 10..19 then 'less than 20 seconds'
+              when 20..39 then 'half a minute'
+              when 40..59 then 'less than a minute'
+              else             '1 minute'
+            end
+
+          when 2..44           then "#{distance_in_minutes} minutes"
+          when 45..89          then 'about 1 hour'
+          when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
+          when 1440..2879      then '1 day'
+          when 2880..43199     then "#{(distance_in_minutes / 1440).round} days"
+          when 43200..86399    then 'about 1 month'
+          when 86400..525599   then "#{(distance_in_minutes / 43200).round} months"
+          when 525600..1051199 then 'about 1 year'
+          else                      "over #{(distance_in_minutes / 525600).round} years"
+        end
+      end
+
+# Taken from Rack::ShowException
+# adapted from Django <djangoproject.com>
+# Copyright (c) 2005, the Lawrence Journal-World
+# Used under the modified BSD license:
+# http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5
+TEMPLATE = <<'HTML'
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+  <meta name="robots" content="NONE,NOARCHIVE" />
+  <title>Thin Stats</title>
+  <style type="text/css">
+    html * { padding:0; margin:0; }
+    body * { padding:10px 20px; }
+    body * * { padding:0; }
+    body { font:small sans-serif; }
+    body>div { border-bottom:1px solid #ddd; }
+    h1 { font-weight:normal; }
+    h2 { margin-bottom:.8em; }
+    h2 span { font-size:80%; color:#666; font-weight:normal; }
+    h3 { margin:1em 0 .5em 0; }
+    h4 { margin:0 0 .5em 0; font-weight: normal; }
+    table {
+        border:1px solid #ccc; border-collapse: collapse; background:white; }
+    tbody td, tbody th { vertical-align:top; padding:2px 3px; }
+    thead th {
+        padding:1px 6px 1px 3px; background:#fefefe; text-align:left;
+        font-weight:normal; font-size:11px; border:1px solid #ddd; }
+    tbody th { text-align:right; color:#666; padding-right:.5em; }
+    table.vars { margin:5px 0 2px 40px; }
+    table.vars td, table.req td { font-family:monospace; }
+    table td.code { width:100%;}
+    table td.code div { overflow:hidden; }
+    table.source th { color:#666; }
+    table.source td {
+        font-family:monospace; white-space:pre; border-bottom:1px solid #eee; }
+    ul.traceback { list-style-type:none; }
+    ul.traceback li.frame { margin-bottom:1em; }
+    div.context { margin: 10px 0; }
+    div.context ol {
+        padding-left:30px; margin:0 10px; list-style-position: inside; }
+    div.context ol li {
+        font-family:monospace; white-space:pre; color:#666; cursor:pointer; }
+    div.context ol.context-line li { color:black; background-color:#ccc; }
+    div.context ol.context-line li span { float: right; }
+    div.commands { margin-left: 40px; }
+    div.commands a { color:black; text-decoration:none; }
+    #summary { background: #ffc; }
+    #summary h2 { font-weight: normal; color: #666; }
+    #summary ul#quicklinks { list-style-type: none; margin-bottom: 2em; }
+    #summary ul#quicklinks li { float: left; padding: 0 1em; }
+    #summary ul#quicklinks>li+li { border-left: 1px #666 solid; }
+    #explanation { background:#eee; }
+    #template, #template-not-exist { background:#f6f6f6; }
+    #template-not-exist ul { margin: 0 0 0 20px; }
+    #traceback { background:#eee; }
+    #summary table { border:none; background:transparent; }
+    #requests { background:#f6f6f6; padding-left:120px; }
+    #requests h2, #requests h3 { position:relative; margin-left:-100px; }
+    #requests h3 { margin-bottom:-1em; }
+    .error { background: #ffc; }
+    .specific { color:#cc3300; font-weight:bold; }
+  </style>
+</head>
+<body>
+
+<div id="summary">
+  <h1>Server stats</h1>
+  <h2><%= Thin::SERVER %></h2>
+  <table>
+    <tr>
+      <th>Uptime</th>
+      <td><%= distance_of_time_in_words(@start_time, Time.now) %> (<%= Time.now - @start_time %> sec)</td>
+    </tr>
+    <tr>
+      <th>PID</th>
+      <td><%=h Process.pid %></td>
+    </tr>
+  </table>
+  
+  <% if @last_request %>
+    <h3>Jump to:</h3>
+    <ul id="quicklinks">
+      <li><a href="#get-info">GET</a></li>
+      <li><a href="#post-info">POST</a></li>
+      <li><a href="#cookie-info">Cookies</a></li>
+      <li><a href="#env-info">ENV</a></li>
+    </ul>
+  <% end %>
+</div>
+
+<div id="stats">
+  <h2>Requests</h2>
+  <h3>Stats</h3>
+  <table class="req">
+    <tr>
+      <td>Requests</td>
+      <td><%= @requests %></td>
+    </tr>
+    <tr>
+      <td>Finished</td>
+      <td><%= @requests_finished %></td>
+    </tr>
+    <tr>
+      <td>Errors</td>
+      <td><%= @requests - @requests_finished %></td>
+    </tr>
+    <tr>
+      <td>Last request</td>
+      <td><%= @last_request_time %> sec</td>
+    </tr>
+  </table>
+</div>
+
+<% if @last_request %>
+  <div id="requestinfo">
+    <h2>Last Request information</h2>
+
+    <h3 id="get-info">GET</h3>
+    <% unless @last_request.GET.empty? %>
+      <table class="req">
+        <thead>
+          <tr>
+            <th>Variable</th>
+            <th>Value</th>
+          </tr>
+        </thead>
+        <tbody>
+            <% @last_request.GET.sort_by { |k, v| k.to_s }.each { |key, val| %>
+            <tr>
+              <td><%=h key %></td>
+              <td class="code"><div><%=h val.inspect %></div></td>
+            </tr>
+            <% } %>
+        </tbody>
+      </table>
+    <% else %>
+      <p>No GET data.</p>
+    <% end %>
+
+    <h3 id="post-info">POST</h3>
+    <% unless @last_request.POST.empty? %>
+      <table class="req">
+        <thead>
+          <tr>
+            <th>Variable</th>
+            <th>Value</th>
+          </tr>
+        </thead>
+        <tbody>
+            <% @last_request.POST.sort_by { |k, v| k.to_s }.each { |key, val| %>
+            <tr>
+              <td><%=h key %></td>
+              <td class="code"><div><%=h val.inspect %></div></td>
+            </tr>
+            <% } %>
+        </tbody>
+      </table>
+    <% else %>
+      <p>No POST data.</p>
+    <% end %>
+
+
+    <h3 id="cookie-info">COOKIES</h3>
+    <% unless @last_request.cookies.empty? %>
+      <table class="req">
+        <thead>
+          <tr>
+            <th>Variable</th>
+            <th>Value</th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @last_request.cookies.each { |key, val| %>
+            <tr>
+              <td><%=h key %></td>
+              <td class="code"><div><%=h val.inspect %></div></td>
+            </tr>
+          <% } %>
+        </tbody>
+      </table>
+    <% else %>
+      <p>No cookie data.</p>
+    <% end %>
+
+    <h3 id="env-info">Rack ENV</h3>
+      <table class="req">
+        <thead>
+          <tr>
+            <th>Variable</th>
+            <th>Value</th>
+          </tr>
+        </thead>
+        <tbody>
+            <% @last_request.env.sort_by { |k, v| k.to_s }.each { |key, val| %>
+            <tr>
+              <td><%=h key %></td>
+              <td class="code"><div><%=h val %></div></td>
+            </tr>
+            <% } %>
+        </tbody>
+      </table>
+
+  </div>
+<% end %>
+
+<div id="explanation">
+  <p>
+    You're seeing this error because you use <code>Thin::Stats</code>.
+  </p>
+</div>
+
+</body>
+</html>
+HTML
     end
   end
 end