diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-11 19:24:32 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-11 19:24:32 -0200 |
| commit | cf7b94c013d4e824433a018001474e71ddd81a99 (patch) | |
| tree | 67b90f1e13a88d60170469e281f081711a976194 /actionpack/lib/action_dispatch/middleware/show_exceptions.rb | |
| parent | 6e55b32e98fcaad82184d2e21ee611a3465e4b20 (diff) | |
| parent | 2297eaed5b195ea42b99d062ad45f87dde9d3c60 (diff) | |
| download | rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.gz rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.bz2 rails-cf7b94c013d4e824433a018001474e71ddd81a99.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/show_exceptions.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index 036deec6d2..471d18491c 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -2,8 +2,6 @@ require "active_support/core_ext/exception" module ActionDispatch class ShowExceptions - include StatusCodes - LOCALHOST = '127.0.0.1'.freeze RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates') @@ -29,7 +27,7 @@ module ActionDispatch 'ActionView::MissingTemplate' => 'missing_template', 'ActionController::RoutingError' => 'routing_error', ActionController::UnknownAction.name => 'unknown_action', - 'ActionView::TemplateError' => 'template_error' + 'ActionView::Template::Error' => 'template_error' }) FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'}, @@ -104,7 +102,7 @@ module ActionDispatch end def status_code(exception) - interpret_status(@@rescue_responses[exception.class.name]).to_i + ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE[@@rescue_responses[exception.class.name]] end def render(status, body) @@ -119,7 +117,7 @@ module ActionDispatch return unless logger ActiveSupport::Deprecation.silence do - if ActionView::TemplateError === exception + if ActionView::Template::Error === exception logger.fatal(exception.to_s) else logger.fatal( |