fixed params in periods, added handle Job stub
This commit is contained in:
parent
b4641b15e1
commit
be1d712573
4 changed files with 10 additions and 2 deletions
|
|
@ -26,7 +26,7 @@ class IntervalPeriod(Period):
|
||||||
self.comment = comment # comment
|
self.comment = comment # comment
|
||||||
|
|
||||||
def createJob(self, scheduler, jobInfo, func):
|
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):
|
def __str__(self):
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,12 @@ class JobInfo:
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
def setLogger(self, log):
|
||||||
|
self.log = log
|
||||||
|
|
||||||
|
def handleCall(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ def parseArgs():
|
||||||
|
|
||||||
|
|
||||||
def handleJob(jobInfo):
|
def handleJob(jobInfo):
|
||||||
|
jobInfo.handleCall()
|
||||||
print str(jobInfo)
|
print str(jobInfo)
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
@ -63,6 +64,7 @@ def main():
|
||||||
for hostGroupService in hg.services:
|
for hostGroupService in hg.services:
|
||||||
log.d(hostGroupService)
|
log.d(hostGroupService)
|
||||||
jobInfo=JobInfo(hg.name, hg.members, hg.hosts, hostGroupService.service, hg.threshold, hg.parent)
|
jobInfo=JobInfo(hg.name, hg.members, hg.hosts, hostGroupService.service, hg.threshold, hg.parent)
|
||||||
|
jobInfo.setLogger(log)
|
||||||
for period in hostGroupService.periods:
|
for period in hostGroupService.periods:
|
||||||
log.d(period)
|
log.d(period)
|
||||||
jobs.append(period.createJob(scheduler, jobInfo, handleJob))
|
jobs.append(period.createJob(scheduler, jobInfo, handleJob))
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@
|
||||||
"services":
|
"services":
|
||||||
{
|
{
|
||||||
"load": ["twentyfourseven"],
|
"load": ["twentyfourseven"],
|
||||||
"discusage":["twentyfourseven"],
|
"discusage":["do_every_x_times"],
|
||||||
"ping": ["twentyfourseven"]
|
"ping": ["twentyfourseven"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue