aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/rescue.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-02 23:02:22 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-02 23:02:22 -0500
commit11af089cee0a0e744e267d32becfe2c66a586d31 (patch)
tree970e6172381f5f246ffbb48b3b46c5393d56a7ec /actionpack/lib/action_dispatch/middleware/rescue.rb
parent1c6fcbfd2d67ce2b2faa29d956566b48e9a61188 (diff)
downloadrails-11af089cee0a0e744e267d32becfe2c66a586d31.tar.gz
rails-11af089cee0a0e744e267d32becfe2c66a586d31.tar.bz2
rails-11af089cee0a0e744e267d32becfe2c66a586d31.zip
Extract ActionController rescue templates into Rescue and ShowExceptions middleware.
This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/rescue.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/rescue.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/rescue.rb b/actionpack/lib/action_dispatch/middleware/rescue.rb
new file mode 100644
index 0000000000..1456825526
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/rescue.rb
@@ -0,0 +1,14 @@
+module ActionDispatch
+ class Rescue
+ def initialize(app, rescuer)
+ @app, @rescuer = app, rescuer
+ end
+
+ def call(env)
+ @app.call(env)
+ rescue Exception => exception
+ env['action_dispatch.rescue.exception'] = exception
+ @rescuer.call(env)
+ end
+ end
+end