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

added core config to jobs and tasks and made use of core variables raw in the tasks

Browse source
This commit is contained in:
Johannes Findeisen 2013-09-20 01:23:50 +02:00
commit 06b933a135
5 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/tasks/jabber.py
View file

@ -17,10 +17,11 @@ class JabberTask(Task):
self.set_task_type(kwargs["type"])
self.recipient = kwargs["args"]["rcpt"]
def execute(self, msg):
client = xmpp.Client('systemchaos.org')
client.connect(server=('systemchaos.org', 5222))
client.auth('linspector', 'PASSWORD', 'alert')
def execute(self, msg, core):
#TODO: totally unstable just to use values from core. make checks before...!
client = xmpp.Client(core["tasks"]["jabber"]["host"])
client.connect(server=(core["tasks"]["jabber"]["host"], core["tasks"]["jabber"]["port"]))
client.auth(core["tasks"]["jabber"]["username"], core["tasks"]["jabber"]["password"], 'alert')
client.sendInitPresence()
message = xmpp.Message(self.recipient, msg)
message.setAttr('type', 'chat')

8
lib/tasks/mail.py
View file

@ -19,14 +19,14 @@ class MailTask(Task):
self.set_task_type(kwargs["type"])
self.recipient = kwargs["args"]["rcpt"]
def execute(self, msg):
def execute(self, msg, core):
message = MIMEText(msg)
message['Subject'] = 'Warning from Linspector'
message['Subject'] = msg
now = datetime.datetime.now()
message['Date'] = now.strftime("%a, %d %b %Y %H:%M:%S")
message['From'] = "warning@linspector.org"
message['From'] = core["tasks"]["mail"]["from"]
message['To'] = self.recipient
s = smtplib.SMTP('localhost')
s = smtplib.SMTP(core["tasks"]["mail"]["host"], core["tasks"]["mail"]["port"])
s.sendmail("warning@linspector.org", self.recipient, message.as_string())
s.quit()