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_controller/metal/rescue.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_controller/metal/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rescue.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/rescue.rb b/actionpack/lib/action_controller/metal/rescue.rb new file mode 100644 index 0000000000..bbca1b2179 --- /dev/null +++ b/actionpack/lib/action_controller/metal/rescue.rb @@ -0,0 +1,13 @@ +module ActionController #:nodoc: + module Rescue + extend ActiveSupport::Concern + include ActiveSupport::Rescuable + + private + def process_action(*args) + super + rescue Exception => exception + rescue_with_handler(exception) || raise(exception) + end + end +end |