X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2Fsendmail.py;h=a5f0c5e8521c76019bd711045b4d1c334a94a50e;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=fe4b7b9481ad8007290aba804dc694a7ef3c3409;hpb=f5cd72e35593c96b9996ab4e49674cccc7525c48;p=plcapi.git diff --git a/PLC/sendmail.py b/PLC/sendmail.py index fe4b7b9..a5f0c5e 100644 --- a/PLC/sendmail.py +++ b/PLC/sendmail.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ import os import sys import pprint @@ -8,7 +6,7 @@ from email.MIMEText import MIMEText 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): @@ -88,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: - 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()