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

just some config object cleanups

Browse source
This commit is contained in:
Johannes Findeisen 2013-06-05 04:18:37 +02:00
commit 09e4d3459b
1 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/config/config.py
View file

@ -1,11 +1,9 @@
import json import json
from services import serviceList
from filters import parseFilterList from filters import parseFilterList
from members import parseMemberList from members import parseMemberList
from hosts import parseHostList
from periods import parsePeriodList from periods import parsePeriodList
from hostgroups import parseHostGroupList #from hostgroups import parseHostGroupList
#from layouts import * #from layouts import parseLayoutList
class Config: class Config:
@ -17,21 +15,12 @@ class Config:
self.dict = json.loads(self.config) self.dict = json.loads(self.config)
self.services = serviceList(self.dict['services'])
self.filters = parseFilterList(self.dict['filters']) self.filters = parseFilterList(self.dict['filters'])
self.members = parseMemberList(self.dict['members'], self.filters, log) self.members = parseMemberList(self.dict['members'], self.filters, log)
self.periods = parsePeriodList(self.dict['periods'], log)
self.periods = parsePeriodList(self.dict['periods'],log) #self.hostgroups = parseHostGroupList(self.dict['hostgroups'],
# self.members,
self.hosts = parseHostList(self.dict['hosts'], self.services, log) # self.periods,
# log)
self.hostgroups = parseHostGroupList(self.dict['hostgroups'],
self.hosts,
self.members,
self.periods,
self.services,
log)
#self.layouts = LayoutList(self.dict['layouts'], self.hostgroups) #self.layouts = LayoutList(self.dict['layouts'], self.hostgroups)