linspector/linspector-old
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added authentication to mail task

Browse source
This commit is contained in:
Johannes Findeisen 2013-11-22 19:41:59 +01:00
commit 5086520ed2
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
linspector/tasks/alert/mail.py
View file

@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
import datetime import datetime
import smtplib import smtplib
import time
from email.mime.text import MIMEText from email.mime.text import MIMEText
from logging import getLogger from logging import getLogger
@ -57,7 +56,13 @@ class MailTask(Task):
if "port" in args: if "port" in args:
self.port = args["port"] self.port = args["port"]
# ...and so on for all possible args self.username = None
if "username" in args:
self.username = args["username"]
self.password = None
if "password" in args:
self.password = args["password"]
def execute(self, job_information): def execute(self, job_information):
logger.debug("Executing Mail Task!") logger.debug("Executing Mail Task!")
@ -68,8 +73,15 @@ class MailTask(Task):
message['Date'] = now.strftime("%a, %d %b %Y %H:%M:%S") message['Date'] = now.strftime("%a, %d %b %Y %H:%M:%S")
message['From'] = self.sender message['From'] = self.sender
message['To'] = self.rcpt message['To'] = self.rcpt
s = smtplib.SMTP(self.host, self.port) s = smtplib.SMTP(self.host, self.port)
#s.login(self.userName, self.password)
if self.username and self.password:
try:
s.login(self.username, self.password)
except Exception, e:
logger.warning(e)
s.sendmail(self.sender, self.rcpt, message.as_string()) s.sendmail(self.sender, self.rcpt, message.as_string())
s.quit() s.quit()