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

too bad, long nights, all good (nearly)

Browse source
This commit is contained in:
Rafael.Timmerberg 2013-06-21 01:46:08 +02:00
commit 1f095725b6
5 changed files with 8 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/config/hostgroups.py
View file

@ -57,7 +57,7 @@ class HostGroup(object):
l.extend(item) l.extend(item)
else: else:
l.append(item) l.append(item)
def add_members(self, member): def add_members(self, member):
self.__add_internal(self.get_members(), member) self.__add_internal(self.get_members(), member)
@ -80,11 +80,8 @@ class HostGroup(object):
return self.processors return self.processors
def get_services(self): def get_services(self):
s = self.__services return self.__services
if not isinstance(s, list):
s = self.__dict__["_HostGroup__services"]
return s
def get_hosts(self): def get_hosts(self):
return self.hosts return self.hosts

2
lib/config/layouts.py
View file

@ -6,7 +6,7 @@ class LayoutException(Exception):
return repr(self.msg) return repr(self.msg)
class Layout: class Layout(object):
def __init__(self, name, enabled=False, hostgroups=None): def __init__(self, name, enabled=False, hostgroups=None):
self._name = name self._name = name
self._enabled = enabled self._enabled = enabled

1
lib/config/parser.py
View file

@ -10,7 +10,6 @@ from members import Member
from periods import CronPeriod, DatePeriod, IntervalPeriod from periods import CronPeriod, DatePeriod, IntervalPeriod
from lib.services.service import Service from lib.services.service import Service
#print id(Service)
from lib.processors.processor import Processor from lib.processors.processor import Processor
from lib.parsers.parser import Parser from lib.parsers.parser import Parser
from lib.tasks.task import Task from lib.tasks.task import Task

2
lib/core/job.py
View file

@ -3,7 +3,7 @@ This is what job_function needs as parameter for each job to successfully
execute. execute.
""" """
from command import Command from lib.core.command import Command
def generateId(): def generateId():

24
linspector
View file

@ -62,29 +62,11 @@ def main():
jobs = [] jobs = []
for layout in layouts: for layout in layouts:
#for i in range(len(layout._hostgroups)):
# for y in range(len(layout._hostgroups[i])._services):
# for period in layout.get_hostgroups()[i]._services[y]:
# log.i("wtf")
# for serv in layout.get_hostgroups()[i].get_services():
# for service in serv:
# for period in service.get_periods():
# pass
if layout.is_enabled(): if layout.is_enabled():
for hostgroup in layout.get_hostgroups(): for hostgroup in layout.get_hostgroups():
for sr in hostgroup.get_services(): for service in hostgroup.s:
if not isinstance(sr, list): for period in service.get_periods():
jobs.append(period.createJob(scheduler, service, handleJob))
log.i("check from hostgroup: id(" + str(id(hostgroup)) + ") " + str(hostgroup))
log.i("check from sr.get_hostgroup(): id(" + str(id(sr.get_hostgroup)) + ") " + str(sr.get_hostgroup()))
sr = hostgroup.__dict__["_HostGroup__services"]
if not isinstance(sr, list):
sr = sr.get_hostgroup().get_services()
for s in sr:
for period in s.get_periods():
jobs.append(period.createJob(scheduler, s, handleJob))
scheduler.start() scheduler.start()
#log.i("starting linspector: reading config... (" + args.config + ")") #log.i("starting linspector: reading config... (" + args.config + ")")