Commit 050b8a43 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #6305 -- Always emit the got_request_exception signal, even when 

DEBUG=True. Patch from Collin Anderson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3815ff7e

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ answer newbie questions, and generally made Django that much better: 
    Marty Alchin <gulopine@gamemusic.org>

    Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com>

    AgarFu <heaven@croasanaso.sytes.net>

    Collin Anderson <cmawebsite@gmail.com>

    Andreas

    andy@jadedplanet.net

    Fabrice Aneche <akh@nobugware.com>

django/core/handlers/base.py

+4 −4
Original line number Diff line number Diff line
@@ -111,13 +111,13 @@ class BaseHandler(object): 
        except SystemExit:

            pass # See http://code.djangoproject.com/ticket/1023

        except: # Handle everything else, including SuspiciousOperation, etc.

            if settings.DEBUG:

                from django.views import debug

                return debug.technical_500_response(request, *sys.exc_info())

            else:

            # Get the exception info now, in case another exception is thrown later.

            exc_info = sys.exc_info()

            receivers = dispatcher.send(signal=signals.got_request_exception, request=request)

            if settings.DEBUG:

                from django.views import debug

                return debug.technical_500_response(request, *exc_info)

            else:

                # When DEBUG is False, send an error message to the admins.

                subject = 'Error (%s IP): %s' % ((request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS and 'internal' or 'EXTERNAL'), request.path)

                try: