NaNtic/trytond-electronic_mail-old
1
0
Fork 0
mirror of https://github.com/NaN-tic/trytond-electronic_mail-old.git synced 2023-12-14 02:22:55 +01:00
Code Issues Projects Releases Wiki Activity

Add logging message when send emails by schedule

Browse source
This commit is contained in:
resteve 2015-03-02 22:54:15 +01:00
parent 903fc2e641
commit 96f50809bb
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
electronic_mail.py
View file

@ -369,8 +369,8 @@ class ElectronicMail(ModelSQL, ModelView):
@param args: Tuple with a limit of emails sent by each call of the cron
'''
pool = Pool()
EMailConfiguration = pool.get('electronic.mail.configuration')
email_configuration = EMailConfiguration(1)
EmailConfiguration = pool.get('electronic.mail.configuration')
email_configuration = EmailConfiguration(1)
out_mailbox = email_configuration.outbox
limit = None
if args:
@ -381,6 +381,8 @@ class ElectronicMail(ModelSQL, ModelView):
emails = cls.search([
('mailbox', '=', out_mailbox)
], order=[('date', 'ASC')], limit=limit)
logging.getLogger('Mail Scheduler').info('Start send %s emails' % (
len(emails)))
return cls.send_emails(emails)
@classmethod
@ -394,13 +396,17 @@ class ElectronicMail(ModelSQL, ModelView):
for mailbox, emails in grouped_emails:
smtp_server = None
if not mailbox.smtp_server:
logging.getLogger('Mail').error('Not configured SMTP server '
'in mailbox %s' % (mailbox.name))
continue
try:
smtp_server = mailbox.smtp_server.get_smtp_server()
except (error, gaierror, SMTPAuthenticationError), e:
try:
cls.raise_user_error('smtp_error', error_args=(e,))
except UserError:
logging.getLogger(' Mail').error(' Messages not sent: %s' %
logging.getLogger('Mail').error('Messages not sent: %s' %
(e,))
else:
for email in emails:
@ -409,11 +415,11 @@ class ElectronicMail(ModelSQL, ModelView):
smtp_server.sendmail(email.from_,
email.recipients_from_fields(), email._get_email())
except SMTPException, e:
logging.getLogger(' Mail').error(
' Messages not sent: %s' % (e,))
logging.getLogger('Mail').error(
'Messages not sent: %s' % (e,))
else:
logging.getLogger(' Mail').info(' Message sent. ID: %s'
% email.id)
logging.getLogger('Mail').info('Send email: %s'
% email.rec_name)
email.mailbox = sent_mailbox
email.flag_send = True
finally: