aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-13 01:04:33 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-13 01:19:24 +0100
commitb0d35ad00c3d7f6f63aa7ae8f3d3cb802bb90d69 (patch)
tree2d8f3aa4b362db150d092a883a27ca46a0af6a63 /actionpack/lib/action_controller
parentda5978c22374b8a3b15a421ff4920e0940435253 (diff)
downloadrails-b0d35ad00c3d7f6f63aa7ae8f3d3cb802bb90d69.tar.gz
rails-b0d35ad00c3d7f6f63aa7ae8f3d3cb802bb90d69.tar.bz2
rails-b0d35ad00c3d7f6f63aa7ae8f3d3cb802bb90d69.zip
Test fragment/page cache and send data/file notifications.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/railties/subscriber.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/railties/subscriber.rb b/actionpack/lib/action_controller/railties/subscriber.rb
index d9d77304ee..d6a71afc23 100644
--- a/actionpack/lib/action_controller/railties/subscriber.rb
+++ b/actionpack/lib/action_controller/railties/subscriber.rb
@@ -24,11 +24,11 @@ module ActionController
def send_file(event)
message = if event.payload[:x_sendfile]
header = ActionController::Streaming::X_SENDFILE_HEADER
- "Sending #{header} header %s"
+ "Sent #{header} header %s"
elsif event.payload[:stream]
- "Streaming file %s"
+ "Streamed file %s"
else
- "Sending file %s"
+ "Sent file %s"
end
message << " (%.1fms)"
@@ -40,7 +40,7 @@ module ActionController
end
def send_data(event)
- info("Sending data %s (%.1fms)" % [event.payload[:filename], event.duration])
+ info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
end
%w(write_fragment read_fragment exist_fragment?
@@ -49,7 +49,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.inspect} (%.1fms)" % event.duration)
+ info("\#{human_name} \#{key_or_path} (%.1fms)" % event.duration)
end
METHOD
end