From f06b06b64095ac5f74e1e0a0533b0ed70b09aeb9 Mon Sep 17 00:00:00 2001
From: Parbhat Puri <parbhatpuri17@gmail.com>
Date: Tue, 3 Dec 2019 12:04:13 +0000
Subject: [PATCH] Log exception if not able to get from_address and set it to
None
---
opentech/apply/activity/messaging.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py
index 43b5b0c66..778e8d0e5 100644
--- a/opentech/apply/activity/messaging.py
+++ b/opentech/apply/activity/messaging.py
@@ -1,5 +1,6 @@
import json
import requests
+import logging
from collections import defaultdict
from django.db import models
@@ -13,7 +14,7 @@ from .models import TEAM, ALL
from .options import MESSAGES
from .tasks import send_mail
-
+logger = logging.getLogger(__name__)
User = get_user_model()
@@ -773,11 +774,14 @@ class EmailAdapter(AdapterBase):
def send_message(self, message, source, subject, recipient, logs, **kwargs):
try:
- try:
- from_email = source.page.specific.from_address
- except AttributeError: # we're dealing with a project
- from_email = source.submission.page.specific.from_address
+ from_email = source.page.specific.from_address
+ except AttributeError: # we're dealing with a project
+ from_email = source.submission.page.specific.from_address
+ except Exception as e:
+ from_address = None
+ logger.exception(e)
+ try:
send_mail(
subject,
message,
--
GitLab