diff --git a/lib/config/periods.py b/lib/config/periods.py index d3e93f3..970001e 100644 --- a/lib/config/periods.py +++ b/lib/config/periods.py @@ -56,7 +56,7 @@ class CronPeriod(Period): return ret def createJob(self, scheduler, jobInfo, func): - return scheduler.add_cron_job(func, self.year, self.month, self.day, self.week, self.day_of_week, self.hour, self.minute, self.second,self.start_date, [jobInfo]) + return scheduler.add_cron_job(func, year=self.year, month=self.month, day=self.day, week=self.week, day_of_week=self.day_of_week, hour=self.hour, minute=self.minute, second=self.second,start_date=self.start_date, args=[jobInfo]) class DatePeriod(Period): @@ -87,12 +87,12 @@ def parsePeriodList(periodlist,log): for i in [ "weeks","days", "hours", "minutes", "seconds", "start_date"]: if i in values: periods.append(IntervalPeriod(name, **values)) - continue + break for i in ["year", "month", "day", "week", "day_of_week", "hour", "minute", "second"]: if i in values: periods.append(CronPeriod(name, **values)) - continue + break log.w("ignoring Period: " +str(name)) log.w("reason: could not determine PeriodType: " + str(values)) diff --git a/linspector b/linspector index cc65298..780e158 100755 --- a/linspector +++ b/linspector @@ -7,6 +7,7 @@ from lib.core.logger import Logger from lib.config.config import Config from lib.config.periods import Period from apscheduler.scheduler import Scheduler +import time import logging import subprocess as sp @@ -58,17 +59,24 @@ def main(): config = Config(args.config, log) log.d("parsed config: " + str(config)) for hg in config.hostgroups: + for hostGroupService in hg.services: + log.d(hostGroupService) jobInfo=JobInfo(hg.name, hg.members, hg.hosts, hostGroupService.service, hg.threshold, hg.parent) for period in hostGroupService.periods: - + log.d(period) jobs.append(period.createJob(scheduler, jobInfo, handleJob)) + for job in jobs: + log.d(str(job)) while True: try: - time.sleep(10) - except: - pass + time.sleep(1) + except error: + print str(error) + + +