Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: send mail only if SMTP was configured(Event Export) #6228

Merged
merged 2 commits into from
Jul 26, 2019
Merged

fix: send mail only if SMTP was configured(Event Export) #6228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4975725
send mail only if SMTP was configured
mrsaicharan1 Jul 23, 2019
4196a01
Merge branch 'development' into smtp-event-fix
mrsaicharan1 Jul 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions app/api/helpers/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from app.api.helpers.utilities import strip_tags
from app.models.session import Session
from app.models.speaker import Speaker

from app.api.helpers.mail import check_smtp_config

"""
Define all API v2 celery tasks here
Expand Down Expand Up @@ -174,6 +174,7 @@ def resize_speaker_images_task(self, speaker_id, photo_url):
def export_event_task(self, email, event_id, settings):
event = safe_query(db, Event, 'id', event_id, 'event_id')
user = db.session.query(User).filter_by(email=email).first()
smtp_encryption = get_settings()['smtp_encryption']
try:
logging.info('Exporting started')
path = event_export_task_base(event_id, settings)
Expand All @@ -183,15 +184,21 @@ def export_event_task(self, email, event_id, settings):
result = {
'download_url': download_url
}

logging.info('Exporting done.. sending email')
send_export_mail(email=email, event_name=event.name, download_url=download_url)
if check_smtp_config(smtp_encryption):
send_export_mail(email=email, event_name=event.name, download_url=download_url)
else:
logging.warning('Error in sending export success email')
send_notif_after_export(user=user, event_name=event.name, download_url=download_url)
except Exception as e:
result = {'__error': True, 'result': str(e)}
logging.warning('Error in exporting.. sending email')
send_export_mail(email=email, event_name=event.name, error_text=str(e))
if check_smtp_config(smtp_encryption):
send_export_mail(email=email, event_name=event.name, error_text=str(e))
else:
logging.warning('Error in sending export error email')
send_notif_after_export(user=user, event_name=event.name, error_text=str(e))

return result


Expand Down