kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix logging when cache key contains % sign [#5570 state:resolved]

Browse source 
Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
Krekoten' Marjan 2010-09-22 23:17:49 +03:00 committed by José Valim
parent da94d0e8ca
commit 8639c10a40
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/lib/action_controller/log_subscriber.rb
View file

@ -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

16
actionpack/test/controller/log_subscriber_test.rb
View file

@ -23,6 +23,10 @@ module Another
def with_fragment_cache
render :inline => "<%= cache('foo'){ 'bar' } %>"
end
def with_fragment_cache_and_percent_in_key
render :inline => "<%= cache('foo%bar'){ 'Contains % sign in key' } %>"
end
def with_page_cache
cache_page("Super soaker", "/index.html")
@ -140,6 +144,18 @@ class ACLogSubscriberTest < ActionController::TestCase
ensure
@controller.config.perform_caching = true
end
def test_with_fragment_cache_and_percent_in_key
@controller.config.perform_caching = true
get :with_fragment_cache_and_percent_in_key
wait
assert_equal 4, logs.size
assert_match /Exist fragment\? views\/foo%bar/, logs[1]
assert_match /Write fragment views\/foo%bar/, logs[2]
ensure
@controller.config.perform_caching = true
end
def test_with_page_cache
@controller.config.perform_caching = true