diff --git a/lib/config/periods.py b/lib/config/periods.py index 970001e..a74c101 100644 --- a/lib/config/periods.py +++ b/lib/config/periods.py @@ -26,7 +26,7 @@ class IntervalPeriod(Period): self.comment = comment # comment def createJob(self, scheduler, jobInfo, func): - return scheduler.add_interval_job(func, self.weeks, self.hours, self.minutes, self.seconds, self.start_date, [jobInfo]) + return scheduler.add_interval_job(func, weeks=self.weeks, hours=self.hours, minutes=self.minutes, seconds=self.seconds, start_date=self.start_date, args=[jobInfo]) def __str__(self): diff --git a/lib/core/job.py b/lib/core/job.py index 33af24e..1406196 100644 --- a/lib/core/job.py +++ b/lib/core/job.py @@ -16,6 +16,12 @@ class JobInfo: def __str__(self): return self.name + def setLogger(self, log): + self.log = log + + def handleCall(self): + pass + diff --git a/linspector b/linspector index 4cb3c0d..f749292 100755 --- a/linspector +++ b/linspector @@ -42,6 +42,7 @@ def parseArgs(): def handleJob(jobInfo): + jobInfo.handleCall() print str(jobInfo) def main(): @@ -63,6 +64,7 @@ def main(): for hostGroupService in hg.services: log.d(hostGroupService) jobInfo=JobInfo(hg.name, hg.members, hg.hosts, hostGroupService.service, hg.threshold, hg.parent) + jobInfo.setLogger(log) for period in hostGroupService.periods: log.d(period) jobs.append(period.createJob(scheduler, jobInfo, handleJob)) diff --git a/linspector.json b/linspector.json index 4fca70c..e0c49e4 100644 --- a/linspector.json +++ b/linspector.json @@ -214,7 +214,7 @@ "services": { "load": ["twentyfourseven"], - "discusage":["twentyfourseven"], + "discusage":["do_every_x_times"], "ping": ["twentyfourseven"] } }