vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] bulk flush - ignore error if job timed out, and retry next time

Browse source
This commit is contained in:
Anand Doshi 2016-05-26 12:31:34 +05:30
parent 9677772400
commit 980443de22
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/email/bulk.py
View file

@ -11,6 +11,7 @@ from frappe.email.email_body import get_email, get_formatted_html
from frappe.utils.verified_command import get_signed_params, verify_request
from html2text import html2text
from frappe.utils import get_url, nowdate, encode, now_datetime, add_days, split_emails, cstr
from rq.timeouts import JobTimeoutException
class BulkLimitCrossedError(frappe.ValidationError): pass
@ -305,9 +306,10 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False):
except (smtplib.SMTPServerDisconnected,
smtplib.SMTPConnectError,
smtplib.SMTPHeloError,
smtplib.SMTPAuthenticationError):
smtplib.SMTPAuthenticationError,
JobTimeoutException):
# bad connection, retry later
# bad connection/timeout, retry later
frappe.db.sql("""update `tabBulk Email` set status='Not Sent', modified=%s where name=%s""",
(now_datetime(), email.name), auto_commit=auto_commit)