From 050b8a436a3016b0211333be3b5ecf7a098fc4bf Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sun, 3 Feb 2008 04:06:35 +0000 Subject: [PATCH] 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 --- AUTHORS | 1 + django/core/handlers/base.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 056f336dec..e5adf620ae 100644 --- a/AUTHORS +++ b/AUTHORS @@ -45,6 +45,7 @@ answer newbie questions, and generally made Django that much better: Marty Alchin Daniel Alves Barbosa de Oliveira Vaz AgarFu + Collin Anderson Andreas andy@jadedplanet.net Fabrice Aneche diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py index 17a24d6f60..7f68946f3d 100644 --- a/django/core/handlers/base.py +++ b/django/core/handlers/base.py @@ -111,13 +111,13 @@ class BaseHandler(object): except SystemExit: pass # See http://code.djangoproject.com/ticket/1023 except: # Handle everything else, including SuspiciousOperation, etc. + # 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, *sys.exc_info()) + return debug.technical_500_response(request, *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) # 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: