Skip to content

Commit 7dd5282

Browse files
mrsaicharan1iamareebjamal
authored andcommitted
fix: send mail only if SMTP was configured(Event Export) (#6228)
Correct usage of func Add missing SMTP parameter
1 parent ec24c30 commit 7dd5282

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

app/api/helpers/tasks.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from app.api.helpers.utilities import strip_tags
1818
from app.models.session import Session
1919
from app.models.speaker import Speaker
20-
20+
from app.api.helpers.mail import check_smtp_config
2121

2222
"""
2323
Define all API v2 celery tasks here
@@ -174,6 +174,7 @@ def resize_speaker_images_task(self, speaker_id, photo_url):
174174
def export_event_task(self, email, event_id, settings):
175175
event = safe_query(db, Event, 'id', event_id, 'event_id')
176176
user = db.session.query(User).filter_by(email=email).first()
177+
smtp_encryption = get_settings()['smtp_encryption']
177178
try:
178179
logging.info('Exporting started')
179180
path = event_export_task_base(event_id, settings)
@@ -183,15 +184,21 @@ def export_event_task(self, email, event_id, settings):
183184
result = {
184185
'download_url': download_url
185186
}
187+
186188
logging.info('Exporting done.. sending email')
187-
send_export_mail(email=email, event_name=event.name, download_url=download_url)
189+
if check_smtp_config(smtp_encryption):
190+
send_export_mail(email=email, event_name=event.name, download_url=download_url)
191+
else:
192+
logging.warning('Error in sending export success email')
188193
send_notif_after_export(user=user, event_name=event.name, download_url=download_url)
189194
except Exception as e:
190195
result = {'__error': True, 'result': str(e)}
191196
logging.warning('Error in exporting.. sending email')
192-
send_export_mail(email=email, event_name=event.name, error_text=str(e))
197+
if check_smtp_config(smtp_encryption):
198+
send_export_mail(email=email, event_name=event.name, error_text=str(e))
199+
else:
200+
logging.warning('Error in sending export error email')
193201
send_notif_after_export(user=user, event_name=event.name, error_text=str(e))
194-
195202
return result
196203

197204

0 commit comments

Comments
 (0)