0
@@ -1,4 +1,6 @@
0
 == 0.6.2 Rambo release
0
+ * Add PID and more info from the last request to the Stats adapter
0
+   mostly taken from Rack::ShowException.
0
  * pid and log files in cluster are no longer required to be relative to the
0
    app directory (chdir option), fixes #24
0
  * Revert to using #each when building response headers under Ruby 1.8,

0
@@ -15,7 +15,6 @@
0
         @requests          = 0
0
         @requests_finished = 0
0
         @start_time        = Time.now
0
-        @last_env          = {}
0
       end
0
       
0
       def call(env)
0
@@ -28,7 +27,7 @@
0
       
0
       def log(env)
0
         @requests += 1
0
-        @last_env = env
0
+        @last_request = Rack::Request.new(env)
0
         request_started_at = Time.now
0
         
0
         response = yield
0
0
@@ -51,7 +50,38 @@
0
           [body]
0
         ]
0
       end
0
+      
0
+      # Taken from Rails
0
+      def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
0
+        from_time = from_time.to_time if from_time.respond_to?(:to_time)
0
+        to_time = to_time.to_time if to_time.respond_to?(:to_time)
0
+        distance_in_minutes = (((to_time - from_time).abs)/60).round
0
+        distance_in_seconds = ((to_time - from_time).abs).round
0
 
0
+        case distance_in_minutes
0
+          when 0..1
0
+            return (distance_in_minutes == 0) ? 'less than a minute' : '1 minute' unless include_seconds
0
+            case distance_in_seconds
0
+              when 0..4   then 'less than 5 seconds'
0
+              when 5..9   then 'less than 10 seconds'
0
+              when 10..19 then 'less than 20 seconds'
0
+              when 20..39 then 'half a minute'
0
+              when 40..59 then 'less than a minute'
0
+              else             '1 minute'
0
+            end
0
+
0
+          when 2..44           then "#{distance_in_minutes} minutes"
0
+          when 45..89          then 'about 1 hour'
0
+          when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
0
+          when 1440..2879      then '1 day'
0
+          when 2880..43199     then "#{(distance_in_minutes / 1440).round} days"
0
+          when 43200..86399    then 'about 1 month'
0
+          when 86400..525599   then "#{(distance_in_minutes / 43200).round} months"
0
+          when 525600..1051199 then 'about 1 year'
0
+          else                      "over #{(distance_in_minutes / 525600).round} years"
0
+        end
0
+      end
0
+
0
 # Taken from Rack::ShowException
0
 # adapted from Django <djangoproject.com>
0
 # Copyright (c) 2005, the Lawrence Journal-World
0
0
@@ -122,12 +152,29 @@
0
 <div id="summary">
0
   <h1>Server stats</h1>
0
   <h2><%= Thin::SERVER %></h2>
0
-  <div id="uptime">
0
-    <%= Time.now - @start_time %> uptime
0
-  </div>
0
+  <table>
0
+    <tr>
0
+      <th>Uptime</th>
0
+      <td><%= distance_of_time_in_words(@start_time, Time.now) %> (<%= Time.now - @start_time %> sec)</td>
0
+    </tr>
0
+    <tr>
0
+      <th>PID</th>
0
+      <td><%=h Process.pid %></td>
0
+    </tr>
0
+  </table>
0
+  
0
+  <% if @last_request %>
0
+    <h3>Jump to:</h3>
0
+    <ul id="quicklinks">
0
+      <li><a href="#get-info">GET</a></li>
0
+      <li><a href="#post-info">POST</a></li>
0
+      <li><a href="#cookie-info">Cookies</a></li>
0
+      <li><a href="#env-info">ENV</a></li>
0
+    </ul>
0
+  <% end %>
0
 </div>
0
 
0
-<div id="requests">
0
+<div id="stats">
0
   <h2>Requests</h2>
0
   <h3>Stats</h3>
0
   <table class="req">
0
0
@@ -148,24 +195,99 @@
0
       <td><%= @last_request_time %> sec</td>
0
     </tr>
0
   </table>
0
-  <% if @last_env %>
0
-    <h3>Last request</h3>
0
-    <table class="req">
0
-      <tr>
0
-        <th>Variable</th>
0
-        <th>Value</th>
0
-      </tr>
0
-      <tr>
0
-      <% @last_env.sort_by { |k, v| k.to_s }.each do |key, val| %>
0
-        <tr>
0
-          <td><%=h key %></td>
0
-          <td class="code"><div><%=h val.inspect %></div></td>
0
-        </tr>
0
-      <% end %>
0
-      </tr>
0
-    </table>
0
-  <% end %>
0
 </div>
0
+
0
+<% if @last_request %>
0
+  <div id="requestinfo">
0
+    <h2>Last Request information</h2>
0
+
0
+    <h3 id="get-info">GET</h3>
0
+    <% unless @last_request.GET.empty? %>
0
+      <table class="req">
0
+        <thead>
0
+          <tr>
0
+            <th>Variable</th>
0
+            <th>Value</th>
0
+          </tr>
0
+        </thead>
0
+        <tbody>
0
+            <% @last_request.GET.sort_by { |k, v| k.to_s }.each { |key, val| %>
0
+            <tr>
0
+              <td><%=h key %></td>
0
+              <td class="code"><div><%=h val.inspect %></div></td>
0
+            </tr>
0
+            <% } %>
0
+        </tbody>
0
+      </table>
0
+    <% else %>
0
+      <p>No GET data.</p>
0
+    <% end %>
0
+
0
+    <h3 id="post-info">POST</h3>
0
+    <% unless @last_request.POST.empty? %>
0
+      <table class="req">
0
+        <thead>
0
+          <tr>
0
+            <th>Variable</th>
0
+            <th>Value</th>
0
+          </tr>
0
+        </thead>
0
+        <tbody>
0
+            <% @last_request.POST.sort_by { |k, v| k.to_s }.each { |key, val| %>
0
+            <tr>
0
+              <td><%=h key %></td>
0
+              <td class="code"><div><%=h val.inspect %></div></td>
0
+            </tr>
0
+            <% } %>
0
+        </tbody>
0
+      </table>
0
+    <% else %>
0
+      <p>No POST data.</p>
0
+    <% end %>
0
+
0
+
0
+    <h3 id="cookie-info">COOKIES</h3>
0
+    <% unless @last_request.cookies.empty? %>
0
+      <table class="req">
0
+        <thead>
0
+          <tr>
0
+            <th>Variable</th>
0
+            <th>Value</th>
0
+          </tr>
0
+        </thead>
0
+        <tbody>
0
+          <% @last_request.cookies.each { |key, val| %>
0
+            <tr>
0
+              <td><%=h key %></td>
0
+              <td class="code"><div><%=h val.inspect %></div></td>
0
+            </tr>
0
+          <% } %>
0
+        </tbody>
0
+      </table>
0
+    <% else %>
0
+      <p>No cookie data.</p>
0
+    <% end %>
0
+
0
+    <h3 id="env-info">Rack ENV</h3>
0
+      <table class="req">
0
+        <thead>
0
+          <tr>
0
+            <th>Variable</th>
0
+            <th>Value</th>
0
+          </tr>
0
+        </thead>
0
+        <tbody>
0
+            <% @last_request.env.sort_by { |k, v| k.to_s }.each { |key, val| %>
0
+            <tr>
0
+              <td><%=h key %></td>
0
+              <td class="code"><div><%=h val %></div></td>
0
+            </tr>
0
+            <% } %>
0
+        </tbody>
0
+      </table>
0
+
0
+  </div>
0
+<% end %>
0
 
0
 <div id="explanation">
0
   <p>