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

changed error in parsing of periods

Browse source
This commit is contained in:
Rafael.Timmerberg 2013-05-27 02:48:35 +02:00
commit e1025fda6c
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/config/periods.py
View file

@ -56,7 +56,7 @@ class CronPeriod(Period):
return ret return ret
def createJob(self, scheduler, jobInfo, func): 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): class DatePeriod(Period):
@ -87,12 +87,12 @@ def parsePeriodList(periodlist,log):
for i in [ "weeks","days", "hours", "minutes", "seconds", "start_date"]: for i in [ "weeks","days", "hours", "minutes", "seconds", "start_date"]:
if i in values: if i in values:
periods.append(IntervalPeriod(name, **values)) periods.append(IntervalPeriod(name, **values))
continue break
for i in ["year", "month", "day", "week", "day_of_week", "hour", "minute", "second"]: for i in ["year", "month", "day", "week", "day_of_week", "hour", "minute", "second"]:
if i in values: if i in values:
periods.append(CronPeriod(name, **values)) periods.append(CronPeriod(name, **values))
continue break
log.w("ignoring Period: " +str(name)) log.w("ignoring Period: " +str(name))
log.w("reason: could not determine PeriodType: " + str(values)) log.w("reason: could not determine PeriodType: " + str(values))

16
linspector
View file

@ -7,6 +7,7 @@ from lib.core.logger import Logger
from lib.config.config import Config from lib.config.config import Config
from lib.config.periods import Period from lib.config.periods import Period
from apscheduler.scheduler import Scheduler from apscheduler.scheduler import Scheduler
import time
import logging import logging
import subprocess as sp import subprocess as sp
@ -58,17 +59,24 @@ def main():
config = Config(args.config, log) config = Config(args.config, log)
log.d("parsed config: " + str(config)) log.d("parsed config: " + str(config))
for hg in config.hostgroups: for hg in config.hostgroups:
for hostGroupService in hg.services: for hostGroupService in hg.services:
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)
for period in hostGroupService.periods: for period in hostGroupService.periods:
log.d(period)
jobs.append(period.createJob(scheduler, jobInfo, handleJob)) jobs.append(period.createJob(scheduler, jobInfo, handleJob))
for job in jobs:
log.d(str(job))
while True: while True:
try: try:
time.sleep(10) time.sleep(1)
except: except error:
pass print str(error)