From ff6fbf850766167b238085e9f6afe0afe42fd626 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Sun, 20 Oct 2013 01:55:19 +0200 Subject: [PATCH] made job id's unique --- linspector/config/hostgroups.py | 23 ++++------------------- linspector/core/job.py | 4 +--- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/linspector/config/hostgroups.py b/linspector/config/hostgroups.py index 4cc8175..b16f80b 100644 --- a/linspector/config/hostgroups.py +++ b/linspector/config/hostgroups.py @@ -61,7 +61,10 @@ class HostGroup(object): self.processors = [] if tmp in kwargs: self.add_processors(kwargs[tmp]) - + + def __str__(self): + return self.name + def _to_config_dict(self, configDict): me = {} me["members"] = [member.nameid for member in self.get_members()] @@ -111,24 +114,6 @@ class HostGroup(object): def get_members(self): return self.members - def __str__(self): - if True: - return str(self.__dict__) - ret = "HostGroup: " + self.name + "\n" - ret += "members: {\n" - for itm in self.members: - ret += str(itm) + "\n" - ret += "}\n" - ret += "hosts: {\n" - for itm in self.hosts: - ret += str(itm) + "\n" - ret += "}\n" - ret += "services: {\n" - for itm in self._services: - ret += str(itm) + "\n" - ret += "}\n" - return ret - class HostGroupService: def __init__(self, services, periods): diff --git a/linspector/core/job.py b/linspector/core/job.py index 0238599..2a4e22e 100644 --- a/linspector/core/job.py +++ b/linspector/core/job.py @@ -47,7 +47,7 @@ class Job: return str(self.__dict__) def __hex__(self): - return hex(crc32(str(self.hostgroup) + str(self.host) + str(self.service) + str(self.members))) + return hex(crc32(str(self.hostgroup) + str(self.host) + str(self.service))) def hex_string(self): ret = self.__hex__() @@ -120,8 +120,6 @@ class Job: self.log.debug("Job " + self.hex_string() + " disabled") - - class JobInfo(object): def __init__(self, jobHex, host, service): self.id = generateId()