From 951837f7c9859ffa5dffba3f9e87bba73d424a5f Mon Sep 17 00:00:00 2001
From: Sarina Canelake <sarina@mitx.mit.edu>
Date: Thu, 17 Oct 2013 13:39:13 -0400
Subject: [PATCH] Catch email exceptions on the legacy dash

---
 lms/djangoapps/instructor/views/legacy.py | 27 +++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/lms/djangoapps/instructor/views/legacy.py b/lms/djangoapps/instructor/views/legacy.py
index 517d8be1d2..013df88a67 100644
--- a/lms/djangoapps/instructor/views/legacy.py
+++ b/lms/djangoapps/instructor/views/legacy.py
@@ -716,18 +716,27 @@ def instructor_dashboard(request, course_id):
         email_subject = request.POST.get("subject")
         html_message = request.POST.get("message")
 
-        # Create the CourseEmail object.  This is saved immediately, so that
-        # any transaction that has been pending up to this point will also be
-        # committed.
-        email = CourseEmail.create(course_id, request.user, email_to_option, email_subject, html_message)
+        try:
+            # Create the CourseEmail object.  This is saved immediately, so that
+            # any transaction that has been pending up to this point will also be
+            # committed.
+            email = CourseEmail.create(course_id, request.user, email_to_option, email_subject, html_message)
 
-        # Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
-        submit_bulk_course_email(request, course_id, email.id)  # pylint: disable=E1101
+            # Submit the task, so that the correct InstructorTask object gets created (for monitoring purposes)
+            submit_bulk_course_email(request, course_id, email.id)  # pylint: disable=E1101
+
+        except Exception as err:
+            # Catch any errors and deliver a message to the user
+            error_msg = "Failed to send email! ({0})".format(err)
+            msg += "<font color='red'>" + error_msg + "</font>"
+            log.exception(error_msg)
 
-        if email_to_option == "all":
-            email_msg = '<div class="msg msg-confirm"><p class="copy">Your email was successfully queued for sending. Please note that for large public classes (~10k), it may take 1-2 hours to send all emails.</p></div>'
         else:
-            email_msg = '<div class="msg msg-confirm"><p class="copy">Your email was successfully queued for sending.</p></div>'
+            # If sending the task succeeds, deliver a success message to the user.
+            if email_to_option == "all":
+                email_msg = '<div class="msg msg-confirm"><p class="copy">Your email was successfully queued for sending. Please note that for large public classes (~10k), it may take 1-2 hours to send all emails.</p></div>'
+            else:
+                email_msg = '<div class="msg msg-confirm"><p class="copy">Your email was successfully queued for sending.</p></div>'
 
     elif "Show Background Email Task History" in action:
         message, datatable = get_background_task_table(course_id, task_type='bulk_course_email')