Shunted responsibility for 404 and 500 error catching from node_view to RequestNodeMi...

[philo.git] / middleware.py

diff --git a/middleware.py b/middleware.py
index 8c208e4..ad660ec 100644 (file)
--- a/middleware.py
+++ b/middleware.py
@@ -1,5 +1,7 @@
+from django.conf import settings

 from django.contrib.sites.models import Site
 from django.contrib.sites.models import Site

-from philo.models import Node
+from django.http import Http404
+from philo.models import Node, View

 
 
 class LazyNode(object):
 
 
 class LazyNode(object):


@@ -32,4 +34,20 @@ class RequestNodeMiddleware(object):
                request.__class__.node = LazyNode()
        
        def process_view(self, request, view_func, view_args, view_kwargs):
                request.__class__.node = LazyNode()
        
        def process_view(self, request, view_func, view_args, view_kwargs):

-               request._cached_node_path = view_kwargs.get('path', '/')
\ No newline at end of file
+               request._cached_node_path = view_kwargs.get('path', '/')
+       
+       def process_exception(self, request, exception):
+               if settings.DEBUG or not hasattr(request, 'node') or not request.node:
+                       return
+               
+               if isinstance(exception, Http404):
+                       error_view = request.node.attributes.get('Http404', None)
+               else:
+                       error_view = request.node.attributes.get('Http500', None)
+               
+               if error_view is None or not isinstance(error_view, View):
+                       # Should this be duck-typing? Perhaps even no testing?
+                       return
+               
+               extra_context = {'exception': exception}
+               return error_view.render_to_response(request, extra_context)
\ No newline at end of file