diff --git a/lib/service/service.py b/lib/service/service.py index 89f02a2..a2f15a4 100644 --- a/lib/service/service.py +++ b/lib/service/service.py @@ -7,9 +7,9 @@ class Service: def _execute(self): self.pre_execute() - self.execute() - self.parse_result() - self.handle_result() + executionResult = self.execute() + parseResult = self.parse_result(executionResult) + self.handle_result(parseResult) def execute(self): pass @@ -17,8 +17,8 @@ class Service: def pre_execute(self): pass - def parse_result(self): - self.parser._parse() + def parse_result(self, executionResult): + return self.parser._parse(executionResult) - def handle_result(self): - pass \ No newline at end of file + def handle_result(self, parseResult): + pass diff --git a/linspector.json b/linspector.json index f7953a9..2255293 100644 --- a/linspector.json +++ b/linspector.json @@ -23,6 +23,7 @@ "short":{ "seconds": 5, "comment": "Interval job; every 10 seconds" }, "middle":{ "seconds": 60, "comment": "Interval job; every 60 seconds" }, "long":{ "minutes": 2, "comment": "Interval job; every 2 minutes" }, + "cron":{ "minute" : "0", "hour": "2", "comment": "cron job at 2"}, "christmas2013":{ "date": "2013-12-24 20:00:00", "comment": "Date Job; just one day at 8PM" } }, "hostgroups":{