aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-09-09 22:42:49 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-09-09 22:42:49 -0500
commitc5b65b4905427cf4cbeb71d0bf5ba65cc9a6cec1 (patch)
tree098ddd9d800c7d1acfb113d182a8a488364bbad2 /actionpack
parent6233628ba0e948c58fdf67a70456798c2da590a3 (diff)
downloadrails-c5b65b4905427cf4cbeb71d0bf5ba65cc9a6cec1.tar.gz
rails-c5b65b4905427cf4cbeb71d0bf5ba65cc9a6cec1.tar.bz2
rails-c5b65b4905427cf4cbeb71d0bf5ba65cc9a6cec1.zip
Only separate loggings with a comma when there are actually two statements
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/benchmarking.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb
index 746894497c..fa572ebf3d 100644
--- a/actionpack/lib/action_controller/benchmarking.rb
+++ b/actionpack/lib/action_controller/benchmarking.rb
@@ -76,7 +76,8 @@ module ActionController #:nodoc:
log_message << view_runtime if logging_view
if logging_active_record
- log_message << ", " + active_record_runtime + ")"
+ log_message << ", " if logging_view
+ log_message << active_record_runtime + ")"
else
")"
end