diff options
| author | Oscar Del Ben <info@oscardelben.com> | 2012-05-14 13:56:26 -0700 |
|---|---|---|
| committer | Oscar Del Ben <info@oscardelben.com> | 2012-05-14 13:56:26 -0700 |
| commit | f2af398efa40dff20d4841d595bc0366660707cc (patch) | |
| tree | 8af0c081de5f2d6cfc1b033c5eefa9954de569dd /actionpack/lib/action_controller/log_subscriber.rb | |
| parent | 59462c1e310b85569785cf5f491611e670c2755b (diff) | |
| parent | 151aa9abae131f1a03513f756aeaef2fc403f9bb (diff) | |
| download | rails-f2af398efa40dff20d4841d595bc0366660707cc.tar.gz rails-f2af398efa40dff20d4841d595bc0366660707cc.tar.bz2 rails-f2af398efa40dff20d4841d595bc0366660707cc.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/log_subscriber.rb')
| -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? |