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

corrected backend-check

Browse source
This commit is contained in:
RafTim 2013-11-03 05:21:12 +01:00
commit a977ea2c07
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/minimal.json
View file

@ -13,8 +13,8 @@
"members":{ "members":{
"root":{ "root":{
"name": "root", "name": "root",
"_tasks": [ "tasks": [
{ "class":"jabber", "type": "jabber", "args": { "rcpt": "hanez@systemchaos.org" }} { "class":"mail", "type": "jabber", "args": { "rcpt": "hanez@systemchaos.org" }}
] ]
} }
}, },
@ -25,10 +25,10 @@
}, },
"hostgroups":{ "hostgroups":{
"a":{ "a":{
"members": ["hanez"], "members": ["root"],
"hosts": [ "a", "b", "c", "d", "e"], "hosts": [ "a", "b", "c", "d", "e"],
"services":[ "services":[
{ "class": "dummy", "args": { "sleep": 1, "fail": 1 }, "periods": ["fast"], "threshold": 3 }, { "class": "dummy", "args": { "sleep": 1, "fail": 1 }, "periods": ["fast"], "threshold": 1 }
] ]
} }
}, },

2
linspector/tasks/TaskList.py
View file

@ -30,7 +30,7 @@ class TaskList(object):
for taskInfo in taskInfos: for taskInfo in taskInfos:
task = self.find_task_by_name(taskInfo["class"]) task = self.find_task_by_name(taskInfo["class"])
if task: if task:
task.execute(taskInfo["args"]) task.execute(msg, taskInfo["args"])

1
linspector/tasks/mail.py
View file

@ -54,7 +54,6 @@ class MailTask(Task):
def execute(self, msg, taskArgs): def execute(self, msg, taskArgs):
if "recipient" not in taskArgs: if "recipient" not in taskArgs:
raise "could not execute Mail Task! No recipient given!" raise "could not execute Mail Task! No recipient given!"
message = MIMEText(msg) message = MIMEText(msg)
message['Subject'] = msg message['Subject'] = msg
now = datetime.datetime.now() now = datetime.datetime.now()