diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-10 10:02:56 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-10 10:02:56 -0700 |
| commit | 9b1eb4f1aacf0559402a3c99b7732a89a3c1f711 (patch) | |
| tree | 6e1665c88e12932a9bc15e73fbcf8f152f19120b | |
| parent | 41420675fd10add560353eaa4e3a3f6518df864e (diff) | |
| parent | 32dd5fcaad8adda837fa7e501e23634ad9491d2d (diff) | |
| download | rails-9b1eb4f1aacf0559402a3c99b7732a89a3c1f711.tar.gz rails-9b1eb4f1aacf0559402a3c99b7732a89a3c1f711.tar.bz2 rails-9b1eb4f1aacf0559402a3c99b7732a89a3c1f711.zip | |
Merge pull request #6253 from rafmagana/master
remove duplicate usage of Rack::Utils.status_code in LogSubscriber#process_action
| -rw-r--r-- | actionpack/lib/action_controller/log_subscriber.rb | 2 |
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 4c76f4c43b..11aa393bf9 100644 --- a/actionpack/lib/action_controller/log_subscriber.rb +++ b/actionpack/lib/action_controller/log_subscriber.rb @@ -20,7 +20,7 @@ module ActionController status = payload[:status] if status.nil? && payload[:exception].present? - status = Rack::Utils.status_code(ActionDispatch::ExceptionWrapper.new({}, payload[:exception]).status_code) + status = ActionDispatch::ExceptionWrapper.new({}, payload[:exception]).status_code end message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration message << " (#{additions.join(" | ")})" unless additions.blank? |