diff --git a/linspector/config/hostgroups.py b/linspector/config/hostgroups.py index d36d142..b421a97 100644 --- a/linspector/config/hostgroups.py +++ b/linspector/config/hostgroups.py @@ -60,11 +60,6 @@ class HostGroup(object): tmp = "parents" if tmp in kwargs: self.add_parents(kwargs[tmp]) - - tmp = "processors" - self.processors = [] - if tmp in kwargs: - self.add_processors(kwargs[tmp]) def __str__(self): return self.name @@ -90,9 +85,6 @@ class HostGroup(object): def add_hosts(self, host): self.__add_internal(self.get_hosts(), host) - - def add_processors(self, processor): - self.__add_internal(self.get_processors(), processor) def add_parents(self, parent): self.__add_internal(self.get_parents(), parent) @@ -102,9 +94,6 @@ class HostGroup(object): def get_parents(self): return self.parents - - def get_processors(self): - return self.processors def get_services(self): return self.__services diff --git a/linspector/config/members.py b/linspector/config/members.py index 27c3d9a..ba54fb2 100644 --- a/linspector/config/members.py +++ b/linspector/config/members.py @@ -17,8 +17,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . """ -import re - from logging import getLogger logger = getLogger(__name__) @@ -41,7 +39,7 @@ class Member: def __init__(self, name="", **kwargs): self.name = name tmp = "tasks" - self.__tasks = [] + self.tasks = [] if not tmp in kwargs: raise MemberMissingArgumentException(tmp, name) self.add_tasks(kwargs[tmp]) @@ -59,7 +57,7 @@ class Member: return self.__tasks def __str__(self): - ret = "Member Id: " + self.nameid + " Name: " + self.name + " Filters: " + str(self.phone) - for f in self.filters: - ret += str(f) + ret = "Member: " + self.name + " Tasks: " + for t in self.tasks: + ret += str(t) return ret \ No newline at end of file