rack-monitor 0.1.0 → 0.2.0

data/README.rdoc

@@ -5,12 +5,12 @@ monitoring tools like Munin.
 
 ==Installation
 
- $ sudo gem install rack-monitor
+ sudo gem install rack-monitor
 
 ==Basic Usage
 
 Rack::Monitor is implemented as a piece of Rack middleware and can be used with
-any Rack-based application. If your application includes a rackup (`.ru`) file
+any Rack-based application. If your application includes a rackup (<tt>.ru</tt>) file
 or uses Rack::Builder to construct the application pipeline, simply require
 and use as follows:
 
@@ -22,23 +22,25 @@ and use as follows:
 
 ==Using with Rails
 
-Add this to your `config/environments/production.rb`:
+Add this to your <tt>config/environments/production.rb</tt>:
 
  config.gem "rack-monitor", :lib => "rack/monitor"
 
  require 'rack/monitor' #Rails bug?
- config.middleware.use Rack::Monitor
+ config.middleware.use ::Rack::Monitor
 
-You should now see `Rack::Monitor` listed in the middleware pipeline:
+You should now see <tt>Rack::Monitor</tt> listed in the middleware pipeline:
 
  RAILS_ENV=production rake middleware
 
+Rack::Monitor doesn't work properly when started with mongrel_rails. Use thin instead.
+
 ==Monitoring with Munin
 
 Copy plugin files from http://github.com/pka/rack-monitor/tree/master/munin/ to /etc/munin/plugins/
 
 Setup a configuration in /etc/munin/plugin-conf.d/ like
-http://github.com/pka/rack-monitor/tree/master/muninplugin-conf.d/rack
+http://github.com/pka/rack-monitor/tree/master/munin/plugin-conf.d/rack
 
  /etc/init.d/munin-node restart
 

data/lib/rack/monitor/monitor_app.rb

@@ -21,9 +21,9 @@ class MonitorApp
       [200, {'Content-Type' => 'text/plain'}, [monitor_output]]
     else
       @sensors.each { |sensor| sensor.before(env) }
-      status, headers, response = @app.call(env)
-      @sensors.each { |sensor| sensor.after(env) }
-      [status, headers, response]
+      status, headers, body = @app.call(env)
+      @sensors.each { |sensor| sensor.after(env, status, headers, body) }
+      [status, headers, body]
     end
   end
 

data/lib/rack/monitor/sensor.rb

@@ -8,7 +8,7 @@ class Sensor
   end
   
   #Called after request
-  def after(env)
+  def after(env, status, headers, body)
   end
   
   #Called before delivering measurements

data/lib/rack/monitor/sensors/request.rb

@@ -1,16 +1,37 @@
 module Rack::Monitor
 
 class Request < Sensor
+  STATUS_CODES = [200, 403, 404]
   def initialize
     @count = 0
+    @status = {}
+    (STATUS_CODES+[1,2,3,4,5]).each { |code| @status[code] = 0 }
   end
   
-  def after(env)
+  def after(env, status, headers, body)
     @count += 1
+    @status[code_group(status)] += 1
   end
   
   def measurements
-    [['count', 'Total requests', @count]]
+    m = [['count', 'Total requests', @count]]
+    STATUS_CODES.each do |status|
+      m << ["status#{status}", "Responses with status #{status}", @status[status]]
+    end
+    [1,2,3,4,5].each do |status|
+      m << ["status#{status}", "Responses with other status #{status}xx", @status[status]]
+    end
+    m
+  end
+
+  private
+
+  def code_group(code)
+    if STATUS_CODES.include?(code)
+      code
+    else
+      code / 100
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-monitor
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Pirmin Kalberer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 +01:00
+date: 2010-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: []