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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,6 +8,7 @@ nbproject
*.so *.so
distfiles distfiles
docs
files files
local local
log log

6
lib/config/parser.py
View file

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

2
lib/processors/mariadb.py
View file

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

2
lib/processors/mongodb.py
View file

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

2
lib/processors/syslog.py
View file

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

2
linspector
View file

@ -13,7 +13,6 @@ from lib.config.parser import FullConfigParser
from apscheduler.scheduler import Scheduler from apscheduler.scheduler import Scheduler
from lib.core.job import JobInfo from lib.core.job import JobInfo
log = None
def parseArgs(): def parseArgs():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
@ -78,7 +77,6 @@ def main():
#Todo: implement user handle #Todo: implement user handle
time.sleep(10) time.sleep(10)
#log.i("starting linspector: reading config... (" + args.config + ")") #log.i("starting linspector: reading config... (" + args.config + ")")
#config_parser = ConfigParser(log) #config_parser = ConfigParser(log)
#config = config_parser.parse_config(args.config) #config = config_parser.parse_config(args.config)