diff --git a/lib/config/hostgroups.py b/lib/config/hostgroups.py index 33e2a3b..8719f88 100644 --- a/lib/config/hostgroups.py +++ b/lib/config/hostgroups.py @@ -27,7 +27,7 @@ class HostGroup: self.add_hosts(kwargs[tmp]) tmp = "services" - self.services = [] + self._services = [] if not tmp in kwargs: raise HostGroupMissingArgumentException(tmp, name) self.add_services(kwargs[tmp]) @@ -80,7 +80,7 @@ class HostGroup: return self.processors def get_services(self): - return self.services + return self._services def get_hosts(self): return self.hosts diff --git a/linspector b/linspector index 4aea47f..b245f2f 100755 --- a/linspector +++ b/linspector @@ -64,10 +64,12 @@ def main(): for layout in layouts: if layout.is_enabled(): for hg in layout.get_hostgroups(): - for services in hg.get_services(): - for service in services: - for period in service.get_periods(): - jobs.append(period.createJob(scheduler, service, handleJob)) + for sr in hg.get_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() #log.i("starting linspector: reading config... (" + args.config + ")")