holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-22 16:03:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Garret Wassermann 2017-09-12 20:57:26 -04:00
commit 612a743069
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helpdesk/lib.py
View File

@ -9,6 +9,7 @@ lib.py - Common functions (eg multipart e-mail)
import logging import logging
import mimetypes import mimetypes
import os import os
from smtplib import SMTPException
try: try:
# Python 2 support # Python 2 support
@ -135,7 +136,15 @@ def send_templated_mail(template_name,
content = attachedfile.read() content = attachedfile.read()
msg.attach(filename, content) msg.attach(filename, content)
return msg.send(fail_silently) logger.debug('Sending email to: {!r}'.format(recipients))
try:
return msg.send()
except SMTPException:
logger.exception('SMTPException raised while sending email to {}'.format(recipients))
if not fail_silently:
raise e
return 0
def query_to_dict(results, descriptions): def query_to_dict(results, descriptions):

2
helpdesk/management/commands/get_email.py
View File

@ -447,7 +447,7 @@ def ticket_from_message(message, queue, logger):
attached = process_attachments(f, files) attached = process_attachments(f, files)
for att_file in attached: for att_file in attached:
logger.info("Attachment '%s' successfully added to ticket from email." % att_file[0]) logger.info("Attachment '%s' (with size %s) successfully added to ticket from email." % (att_file[0], att_file[1].size))
context = safe_template_context(t) context = safe_template_context(t)