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

Merge pull request #327 from anandpdoshi/hotfix

Browse source 
[minor] [fix] error logging for pop
This commit is contained in:
Anand Doshi 2013-12-02 03:46:23 -08:00
commit 9ba2f41ef1
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
webnotes/utils/email_lib/receive.py
View file

@ -197,16 +197,8 @@ class POP3Mailbox:
raise
except:
error_msg = "Error in retrieving email."
if not incoming_mail:
# retrieve headers
incoming_mail = IncomingMail(b'\n'.join(self.pop.top(msg_num, 5)[1]))
error_msg += "\nDate: {date}\nFrom: {from_email}\nSubject: {subject}\n".format(
date=incoming_mail.date, from_email=incoming_mail.from_email, subject=incoming_mail.subject)
# log performs rollback and logs error in scheduler log
log("receive.get_messages", error_msg)
log("receive.get_messages", self.make_error_msg(msg_num, incoming_mail))
self.errors = True
webnotes.conn.rollback()
@ -227,4 +219,19 @@ class POP3Mailbox:
raise TotalSizeExceededError
else:
raise EmailSizeExceededError
def make_error_msg(self, msg_num, incoming_mail):
error_msg = "Error in retrieving email."
if not incoming_mail:
try:
# retrieve headers
incoming_mail = IncomingMail(b'\n'.join(self.pop.top(msg_num, 5)[1]))
except:
pass
if incoming_mail:
error_msg += "\nDate: {date}\nFrom: {from_email}\nSubject: {subject}\n".format(
date=incoming_mail.date, from_email=incoming_mail.from_email, subject=incoming_mail.subject)
return error_msg