diff options
Diffstat (limited to 'actionpack/lib/action_controller/benchmarking.rb')
| -rw-r--r-- | actionpack/lib/action_controller/benchmarking.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb index 25d9f50e74..6a78ad5dac 100644 --- a/actionpack/lib/action_controller/benchmarking.rb +++ b/actionpack/lib/action_controller/benchmarking.rb @@ -15,12 +15,12 @@ module ActionController #:nodoc: } end - def render_with_benchmark(template_name = default_template_name, status = "200 OK") + def render_with_benchmark(options = {}, deprecated_status = nil) if logger.nil? - render_without_benchmark(template_name, status) + render_without_benchmark(options, deprecated_status) else db_runtime = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? - @rendering_runtime = Benchmark::measure{ render_without_benchmark(template_name, status) }.real + @rendering_runtime = Benchmark::measure{ render_without_benchmark(options, deprecated_status) }.real if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? @db_rt_before_render = db_runtime |