From 8059008bdee5a3c3f47924212005209096638c26 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Mon, 6 Aug 2012 10:13:12 -0400
Subject: [PATCH] Switch from exception logging middleware to a django signal
 handler, so that we no longer swallow Http404 exceptions and turn them into
 500 errors

---
 cms/envs/common.py                   |  1 +
 common/djangoapps/util/middleware.py | 16 ----------------
 lms/envs/common.py                   |  4 +++-
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 common/djangoapps/util/middleware.py

diff --git a/cms/envs/common.py b/cms/envs/common.py
index 896c4515a2..5ed4dcfff1 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -116,6 +116,7 @@ MIDDLEWARE_CLASSES = (
 )
 
 ############################ SIGNAL HANDLERS ################################
+# This is imported to register the exception signal handling that logs exceptions
 import monitoring.exceptions  # noqa
 
 ############################ DJANGO_BUILTINS ################################
diff --git a/common/djangoapps/util/middleware.py b/common/djangoapps/util/middleware.py
deleted file mode 100644
index eeffa2668c..0000000000
--- a/common/djangoapps/util/middleware.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import logging
-
-from django.conf import settings
-from django.http import HttpResponseServerError
-
-log = logging.getLogger("mitx")
-
-class ExceptionLoggingMiddleware(object):
-    """Just here to log unchecked exceptions that go all the way up the Django 
-    stack"""
-
-    if not settings.TEMPLATE_DEBUG:
-        def process_exception(self, request, exception):
-            log.exception(exception)
-            return HttpResponseServerError("Server Error - Please try again later.")
-
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 8475cfa9a9..2d631407a7 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -151,6 +151,9 @@ MODULESTORE = {
     }
 }
 
+############################ SIGNAL HANDLERS ################################
+# This is imported to register the exception signal handling that logs exceptions
+import monitoring.exceptions  # noqa
 
 ############################### DJANGO BUILT-INS ###############################
 # Change DEBUG/TEMPLATE_DEBUG in your environment settings files, not here
@@ -262,7 +265,6 @@ TEMPLATE_LOADERS = (
 )
 
 MIDDLEWARE_CLASSES = (
-    'util.middleware.ExceptionLoggingMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',