1 files changed, 23 insertions, 38 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a2951bb42..3a1ec95cc 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,13 +5,18 @@
 # will be available for all controllers.
 #
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
-# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
+# Email: hello@mysociety.org; WWW: http://www.mysociety.org/
 
 require 'open-uri'
 
 class ApplicationController < ActionController::Base
     class PermissionDenied < StandardError
     end
+    class RouteNotFound < StandardError
+    end
+    # assign our own handler method for non-local exceptions
+    rescue_from Exception, :with => :render_exception
+
     # Standard headers, footers and navigation for whole site
     layout "default"
     include FastGettext::Translation # make functions like _, n_, N_ etc available)
@@ -111,55 +116,35 @@ class ApplicationController < ActionController::Base
         end
     end
 
-    # Override default error handler, for production sites.
-    def rescue_action_in_public(exception)
-        # Looks for before_filters called something like `set_view_paths_{themename}`. These
-        # are set by the themes.
-        # Normally, this is called by the theme itself in a
-        # :before_filter, but when there's an error, this doesn't
-        # happen.  By calling it here, we can ensure error pages are
-        # still styled according to the theme.
-        ActionController::Base.before_filters.select{|f| f.to_s =~ /set_view_paths/}.each do |f|
-            self.send(f)
-        end
-        # Make sure expiry time for session is set (before_filters are
-        # otherwise missed by this override)
-        session_remember_me
+    def render_exception(exception)
 
-        # Make sure the locale is set correctly too
-        set_gettext_locale
+        # In development, or the admin interface, or for a local request, let Rails handle the exception
+        # with its stack trace templates. Local requests in testing are a special case so that we can
+        # test this method - there we use consider_all_requests_local to control behaviour.
+        if Rails.application.config.consider_all_requests_local || local_request? ||
+        (request.local? && !Rails.env.test?)
+            raise exception
+        end
 
+        @exception_backtrace = exception.backtrace.join("\n")
+        @exception_class = exception.class.to_s
+        @exception_message = exception.message
         case exception
-        when ActiveRecord::RecordNotFound, ActionController::UnknownAction, ActionController::RoutingError
+        when ActiveRecord::RecordNotFound, RouteNotFound
             @status = 404
         when PermissionDenied
             @status = 403
         else
+            message = "\n#{@exception_class} (#{@exception_message}):\n"
+            backtrace = Rails.backtrace_cleaner.clean(exception.backtrace, :silent)
+            message << "  " << backtrace.join("\n  ")
+            Rails.logger.fatal("#{message}\n\n")
+            ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver
             @status = 500
-            notify_about_exception exception
         end
-        # Display user appropriate error message
-        @exception_backtrace = exception.backtrace.join("\n")
-        @exception_class = exception.class.to_s
-        @exception_message = exception.message
         render :template => "general/exception_caught", :status => @status
     end
 
-    # FIXME: This was disabled during the Rails 3 upgrade as this is now handled by Rack
-    # # For development sites.
-    # alias original_rescue_action_locally rescue_action_locally
-    # def rescue_action_locally(exception)
-    #     # Make sure expiry time for session is set (before_filters are
-    #     # otherwise missed by this override)
-    #     session_remember_me
-
-    #     # Make sure the locale is set correctly too
-    #     set_gettext_locale
-
-    #     # Display default, detailed error for developers
-    #     original_rescue_action_locally(exception)
-    # end
-
     def local_request?
         false
     end