Merge pull request postrank-labs#136 from radsaq/skip_logging2

Add option to log to the null logger in the Heartbeat middleware
double-z · Jan 15, 2012 · 8d3bde4 · 8d3bde4
2 parents b3b4de1 + 98ae773
commit 8d3bde4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/lib/goliath/rack/heartbeat.rb b/lib/goliath/rack/heartbeat.rb
@@ -16,6 +16,8 @@ def initialize(app, opts = {})
 
       def call(env)
         if env['PATH_INFO'] == @opts[:path]
+          env[Goliath::Constants::RACK_LOGGER] = Log4r::Logger.root unless @opts[:log]
+
           @opts[:response]
         else
           @app.call(env)

diff --git a/spec/unit/rack/heartbeat_spec.rb b/spec/unit/rack/heartbeat_spec.rb
@@ -52,6 +52,19 @@
       headers.should == {}
       body.should == nil
     end
+
+    it 'does not log the request by default' do
+      @env['PATH_INFO'] = '/status'
+      @hb.call(@env)
+      @env[Goliath::Constants::RACK_LOGGER].should == Log4r::Logger.root
+    end
+
+    it 'logs the request only if asked' do
+      @env['PATH_INFO'] = '/status'
+      @hb = Goliath::Rack::Heartbeat.new(@app, :log => true)
+      @hb.call(@env)
+      @env[Goliath::Constants::RACK_LOGGER].should_not == Log4r::Logger.root
+    end
   end
 end