From 67ad6acc20ca659ca91223cca0e2e5e17a61b597 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Fri, 20 Sep 2013 02:39:23 +0200 Subject: [PATCH] just some more core config stuff and disabled xmpp logging --- lib/tasks/jabber.py | 2 +- lib/tasks/mail.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tasks/jabber.py b/lib/tasks/jabber.py index ba258f3..a3bc4cd 100644 --- a/lib/tasks/jabber.py +++ b/lib/tasks/jabber.py @@ -19,7 +19,7 @@ class JabberTask(Task): 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 = xmpp.Client(core["tasks"]["jabber"]["host"], core["tasks"]["jabber"]["port"], None) client.connect(server=(core["tasks"]["jabber"]["host"], core["tasks"]["jabber"]["port"])) client.auth(core["tasks"]["jabber"]["username"], core["tasks"]["jabber"]["password"], 'alert') client.sendInitPresence() diff --git a/lib/tasks/mail.py b/lib/tasks/mail.py index ca3280c..4ed4aeb 100644 --- a/lib/tasks/mail.py +++ b/lib/tasks/mail.py @@ -15,7 +15,7 @@ class MailTask(Task): if not "type" in kwargs: raise Exception("'type' not in typeDict " + str(kwargs)) if not "args" in kwargs: - raise Exception("typeDict " + str(kwargs) + " has nor arguments!") + raise Exception("typeDict " + str(kwargs) + " has no arguments!") self.set_task_type(kwargs["type"]) self.recipient = kwargs["args"]["rcpt"] @@ -27,7 +27,7 @@ class MailTask(Task): message['From'] = core["tasks"]["mail"]["from"] message['To'] = self.recipient s = smtplib.SMTP(core["tasks"]["mail"]["host"], core["tasks"]["mail"]["port"]) - s.sendmail("warning@linspector.org", self.recipient, message.as_string()) + s.sendmail(core["tasks"]["mail"]["from"], self.recipient, message.as_string()) s.quit()