rack-monitor 0.3.0 → 0.4.0

data/lib/rack/monitor/monitor_app.rb

@@ -11,7 +11,10 @@ module Rack::Monitor
 class MonitorApp
   def initialize(app, options={})
     @app = app
-    @options = {:url=>'/rack_status'}.merge(options)
+    @options = {
+      :url => '/rack_status',
+      :ignore_addr => ['127.0.0.1']
+    }.merge(options)
     sensor_class_names = Rack::Monitor.constants.reject { |s| %q(Sensor MonitorApp).include?(s) }
     @sensors = sensor_class_names.collect { |s| Rack::Monitor.const_get(s).new }
     @watches = {}
@@ -26,17 +29,21 @@ class MonitorApp
     if env["PATH_INFO"] == @options[:url]
       [200, {'Content-Type' => 'text/plain'}, [monitor_output]]
     else
-      @sensors.each { |sensor| sensor.before(env) }
-      if @watches.has_key?(env["PATH_INFO"])
-        @watches[env["PATH_INFO"]].each { |sensor| sensor.before(env) }
+      unless @options[:ignore_addr].include?(env['REMOTE_ADDR'])
+        @sensors.each { |sensor| sensor.before(env) }
+        if @watches.has_key?(env["PATH_INFO"])
+          @watches[env["PATH_INFO"]].each { |sensor| sensor.before(env) }
+        end
       end
 
       status, headers, body = @app.call(env)
 
-      if @watches.has_key?(env["PATH_INFO"])
-        @watches[env["PATH_INFO"]].each { |sensor| sensor.after(env, status, headers, body) }
+      unless @options[:ignore_addr].include?(env['REMOTE_ADDR'])
+        if @watches.has_key?(env["PATH_INFO"])
+          @watches[env["PATH_INFO"]].each { |sensor| sensor.after(env, status, headers, body) }
+        end
+        @sensors.each { |sensor| sensor.after(env, status, headers, body) }
       end
-      @sensors.each { |sensor| sensor.after(env, status, headers, body) }
       [status, headers, body]
     end
   end

data/munin/rack_memory

@@ -65,7 +65,6 @@ if ( defined $ARGV[0] and $ARGV[0] eq "config" )
     print "graph_category Http\n";
     foreach my $port (@PORTS) {
         print "memory$port.label Port $port\n";
-        print "memory$port.draw AREA\n";
         print "memory$port.info Memory used by rack process.\n";
     }
     exit 0;

metadata

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