Fixed issue in email subject.

Author: sonus21

error_tracker/__init__.py

@@ -6,18 +6,20 @@
 #    :license: BSD-3-Clause
 #
 
-__version__ = '1.0'
+__version__ = '1.1.1'
 __author__ = 'Sonu Kumar'
 __email__ = 'sonunitw12@gmail.com'
 
 from error_tracker.libs.mixins import *
 from error_tracker.flask import *
 from error_tracker.django import *
 from error_tracker.django.apps import DjangoErrorTracker
+from error_tracker.libs.exception_formatter import *
 
 __all__ = [
     "AppErrorTracker", "DefaultFlaskContextBuilder",
     "NotificationMixin", "ModelMixin", "MaskingMixin",
     "ContextBuilderMixin", "TicketingMixin",
-    "DefaultDjangoContextBuilder", "DjangoErrorTracker"
+    "DefaultDjangoContextBuilder", "DjangoErrorTracker",
+    "format_exception", "print_exception"
 ]

error_tracker/flask/flask_error.py

@@ -152,6 +152,8 @@ def _set_notification_fields(self, recipients, send_notification, subject_prefix
 
             if subject_prefix in [None, ""]:
                 warn("APP_ERROR_SUBJECT_PREFIX is not set in the app config")
+            else:
+                self.notification_subject_prefix = subject_prefix
 
     def teardown(self, exception):
         pass

error_tracker/libs/exception_formatter.py

@@ -172,12 +172,11 @@ def format_exception(tb, max_elements=1000,
     return op
 
 
-def print_exception():
+def print_exception(masking=None, file=sys.stderr):
     """
     Print traceback in formatted format
     :return:  None
     """
     ty, val, tb = sys.exc_info()
-    string = format_exception(tb)
-    print(string)
-    traceback.print_tb(tb)
+    string = format_exception(tb, masking=masking)
+    print(string, file=file)

error_tracker/libs/utils.py

@@ -52,12 +52,14 @@ def get_context_detail(request, masking, context_builder):
 
 
 def get_notification_subject(notification_subject_prefix, method, url, exception):
-    if notification_subject_prefix:
-        subject = "[%s][%s] %s" % (notification_subject_prefix, method, url)
-    else:
+    if notification_subject_prefix and method:
+        subject = "[%s] [%s] %s" % (notification_subject_prefix, method, url)
+    elif method:
         subject = "[%s] %s" % (method, url)
+    else:
+        subject = "[%s]" % notification_subject_prefix if notification_subject_prefix else ""
     if exception:
-        subject = "[%s] %s" % (exception, subject)
+        subject = "%s %s" % (subject, exception)
     return subject
 
 

examples/flask-sample/app.py

@@ -8,14 +8,17 @@
 
 
 class Notifier(Mail, NotificationMixin):
+    def __init__(self, *args, **kwargs):
+        Mail.__init__(self, *args, **kwargs)
+        NotificationMixin.__init__(self, *args, **kwargs)
+
     def notify(self, request, exception,
                email_subject=None,
                email_body=None,
                from_email=None,
                recipient_list=None):
         message = Message(email_subject, recipient_list, email_body, sender=from_email)
-        # send message
-        # self.send(message)
+        #self.send(message)
 
 
 class Ticketing(TicketingMixin):

tests/DjangoTest/DjangoTest/notification_settings.py

@@ -2,3 +2,4 @@
 
 APP_ERROR_RECIPIENT_EMAIL = ("test@example.com",)
 APP_ERROR_EMAIL_SENDER = "sender@example.com"
+APP_ERROR_SUBJECT_PREFIX = "Server Error"

tests/DjangoTest/tests/test_notification.py

@@ -9,12 +9,15 @@
 import unittest
 from django.test import TestCase
 from util import TestBase
+from DjangoTest.notification_settings import APP_ERROR_SUBJECT_PREFIX
 
 
 class NotificationConfigurationTests(TestBase, TestCase):
     def test_email_send(self):
         self.get('/value-error')
-        self.assertEqual(len(self.get_notifications()), 1)
+        notifications = self.get_notifications()
+        self.assertEqual(len(notifications), 1)
+        self.assertTrue(APP_ERROR_SUBJECT_PREFIX in notifications[0][0])
         self.get('/value-error')
         self.assertEqual(len(self.get_notifications()), 2)
         self.post('/value-error')

tests/FlaskTest/configs/notification_config_enabled.py

@@ -1,6 +1,6 @@
 APP_ERROR_SEND_NOTIFICATION = True
 APP_ERROR_RECIPIENT_EMAIL = ["test@example.com", "test2@example.com"]
-APP_ERROR_SUBJECT_PREFIX = ""
+APP_ERROR_SUBJECT_PREFIX = "Server Error"
 APP_ERROR_MASK_WITH = "**************"
 APP_ERROR_MASKED_KEY_HAS = ("password", "secret")
 APP_ERROR_URL_PREFIX = "/dev/error"

tests/FlaskTest/test_notification.py

@@ -41,6 +41,9 @@ def email_send(self):
             result = c.get('/value-error')
             self.assertEqual(u'500', result.data.decode('utf-8'))
             self.assertEqual(len(self.mailer.get_notifications()), 1)
+            notification = self.mailer.get_notifications()[0]
+            self.assertTrue(
+                notification[0].startswith("[" + notification_config_enabled.APP_ERROR_SUBJECT_PREFIX + "]"))
             c.get('/value-error')
             self.assertEqual(len(self.mailer.get_notifications()), 2)
 

tests/utils.py

@@ -60,7 +60,7 @@ def notify(self, request, exception,
                email_body=None,
                from_email=None,
                recipient_list=None):
-        self.emails.append(email_body)
+        self.emails.append((email_subject, email_body))
 
     def clear(self):
         self.emails = []