Merge branch 'master' of github.com:linspector/linspector

This commit is contained in:
Rafael.Timmerberg 2013-06-23 02:27:21 +02:00
commit fb86c2b4d4
6 changed files with 7 additions and 8 deletions

View file

@ -242,12 +242,12 @@ class FullConfigParser(ConfigParser):
id_get_func = lambda member: member.get_id()
self.replace_pointer(self.hostgroups, members, id_list_func, id_get_func)
id_list_func = lambda service: service.get_periods()
id_list_func = lambda service: service.get_periods()
id_get_func = lambda period: period.get_name()
self.replace_pointer(services, periods, id_list_func, id_get_func)
id_list_func = lambda layout: layout.get_hostgroups()
id_get_func = lambda hostgroup: hostgroup.get_name()
id_get_func = lambda hostgroup: hostgroup.get_name()
self.replace_pointer(layouts, self.hostgroups, id_list_func, id_get_func)
for hg in self.hostgroups:
@ -257,4 +257,4 @@ class FullConfigParser(ConfigParser):
if "core" in self.jsonDict:
core = self.jsonDict["core"]
return (layouts, core)
return layouts, core

View file

@ -7,7 +7,7 @@ from lib.processors.processor import Processor
class MariadbProcessor(Processor):
def __init__(self, **kwargs):
pass
Processor.__init__(self, **kwargs)
def create(kwargs):

View file

@ -7,7 +7,7 @@ from lib.processors.processor import Processor
class MongodbProcessor(Processor):
def __init__(self, **kwargs):
pass
Processor.__init__(self, **kwargs)
def create(kwargs):

View file

@ -7,7 +7,7 @@ from lib.processors.processor import Processor
class SyslogProcessor(Processor):
def __init__(self, **kwargs):
pass
Processor.__init__(self, **kwargs)
def create(kwargs):