aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-16 10:20:36 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-16 10:20:36 -0700
commit5f844d6cc6b2c8ee54d8bfcd00b18d411f406c93 (patch)
treefdd408aee29bd9e7a5c4ac3c36430e54c1d0e286 /actionpack/lib
parent6a185aa0a849ec7cd8d9536124505f668db11db5 (diff)
parent538f8ba0c16bb6c57b5b79320fc1a99afd14b0e2 (diff)
downloadrails-5f844d6cc6b2c8ee54d8bfcd00b18d411f406c93.tar.gz
rails-5f844d6cc6b2c8ee54d8bfcd00b18d411f406c93.tar.bz2
rails-5f844d6cc6b2c8ee54d8bfcd00b18d411f406c93.zip
Merge branch '3-2-sec' into 3-2-stable
* 3-2-sec: updating changelogs bumping to 3.2.15 bumping to rc3 Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build" Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target" bumping to rc2 Merge pull request #12443 from arthurnn/add_inverse_of_add_target bumping version to 3.2.15.rc1 Remove the use of String#% when formatting durations in log messages Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/log_subscriber.rb11
-rw-r--r--actionpack/lib/action_pack/version.rb2
2 files changed, 6 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 194f26aefc..f2545ef2cd 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -23,7 +23,7 @@ module ActionController
exception_class_name = payload[:exception].first
status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name)
end
- message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
+ message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{format_duration(event.duration)}"
message << " (#{additions.join(" | ")})" unless additions.blank?
info(message)
@@ -34,9 +34,7 @@ module ActionController
end
def send_file(event)
- message = "Sent file %s"
- message << " (%.1fms)"
- info(message % [event.payload[:path], event.duration])
+ info("Sent file #{event.payload[:path]} (#{format_duration(event.duration)})")
end
def redirect_to(event)
@@ -44,7 +42,7 @@ module ActionController
end
def send_data(event)
- info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
+ info("Sent data #{event.payload[:filename]} (#{format_duration(event.duration)})")
end
%w(write_fragment read_fragment exist_fragment?
@@ -53,7 +51,8 @@ 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}")
+ duration = format_duration(event.duration)
+ info("\#{human_name} \#{key_or_path} \#{duration}")
end
METHOD
end
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 993c5d7d2a..dda9fd66d2 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 14
+ TINY = 15
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')