fiveruns-dash-merb 0.6.3 → 0.6.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 6

data/lib/fiveruns/dash/merb/recipe.rb

@@ -1,7 +1,16 @@
 Fiveruns::Dash.register_recipe :merb, :url => 'http://dash.fiveruns.com' do |recipe|
   recipe.time :response_time, :method => 'Merb::Request#dispatch_action'
+  
   recipe.counter :requests, :incremented_by => 'Merb::Request#dispatch_action'
-  recipe.time :render_time, :method => 'Merb::RenderMixin#render'
+  
+  # Mark re-entrant so this doesn't get counted multiple times if nested
+  recipe.time :render_time, :method => 'Merb::RenderMixin#render',
+                            :reentrant => true
+  
+  # ==============
+  # = EXCEPTIONS =
+  # ==============
+  
   merb_exceptions = Merb::ControllerExceptions.constants.map do |name|
     "Merb::ControllerExceptions::#{name}"
   end
@@ -25,4 +34,5 @@ Fiveruns::Dash.register_recipe :merb, :url => 'http://dash.fiveruns.com' do |rec
     # TODO: capture headers
     info
   end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-merb
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - FiveRuns Development Team