git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
====
[plcapi.git]
/
PLC
/
sendmail.py
diff --git
a/PLC/sendmail.py
b/PLC/sendmail.py
index
cab0ae6
..
a5f0c5e
100644
(file)
--- a/
PLC/sendmail.py
+++ b/
PLC/sendmail.py
@@
-6,7
+6,7
@@
from email.MIMEText import MIMEText
from email.Header import Header
from smtplib import SMTP
from email.Header import Header
from smtplib import SMTP
-from PLC.
Debug import log
+from PLC.
Logger import logger
from PLC.Faults import *
def sendmail(api, To, Subject, Body, From = None, Cc = None, Bcc = None):
from PLC.Faults import *
def sendmail(api, To, Subject, Body, From = None, Cc = None, Bcc = None):
@@
-86,7
+86,8
@@
def sendmail(api, To, Subject, Body, From = None, Cc = None, Bcc = None):
msg['X-Mailer'] = "Python/" + sys.version.split(" ")[0]
if not api.config.PLC_MAIL_ENABLED:
msg['X-Mailer'] = "Python/" + sys.version.split(" ")[0]
if not api.config.PLC_MAIL_ENABLED:
- print >> log, "From: %(From)s, To: %(To)s, Subject: %(Subject)s" % msg
+ logger.info("PLC_MAIL_ENABLED not set")
+ logger.info("From: %(From)s, To: %(To)s, Subject: %(Subject)s" % msg)
return
s = SMTP()
return
s = SMTP()