aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorKrekoten' Marjan <krekoten@gmail.com>2010-09-22 23:17:49 +0300
committerJosé Valim <jose.valim@gmail.com>2010-09-25 11:04:20 +0200
commit8639c10a40604cee2f3d412470c2960712fdc809 (patch)
treed24959945486950eb948f81c1aa5b2ccbfaffa17 /actionpack/lib/action_controller
parentda94d0e8ca03209610a01f1be8d056319befe571 (diff)
downloadrails-8639c10a40604cee2f3d412470c2960712fdc809.tar.gz
rails-8639c10a40604cee2f3d412470c2960712fdc809.tar.bz2
rails-8639c10a40604cee2f3d412470c2960712fdc809.zip
Fix logging when cache key contains % sign [#5570 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/log_subscriber.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index ece270b3ce..3b19310a69 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -42,7 +42,7 @@ module ActionController
def #{method}(event)
key_or_path = event.payload[:key] || event.payload[:path]
human_name = #{method.to_s.humanize.inspect}
- info("\#{human_name} \#{key_or_path} (%.1fms)" % event.duration)
+ info("\#{human_name} \#{key_or_path} \#{"(%.1fms)" % event.duration}")
end
METHOD
end