Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

Signed-off-by: José Valim <jose.valim@gmail.com>
  • Loading branch information...
commit 8639c10a40604cee2f3d412470c2960712fdc809 1 parent da94d0e
@krekoten krekoten authored josevalim committed
View
2  actionpack/lib/action_controller/log_subscriber.rb
@@ -42,7 +42,7 @@ def send_data(event)
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
View
16 actionpack/test/controller/log_subscriber_test.rb
@@ -23,6 +23,10 @@ def file_sender
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 @@ def test_with_fragment_cache
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
Please sign in to comment.
Something went wrong with that request. Please try again.