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

fixed returnType of host.getServiceByName

Browse source
This commit is contained in:
Rafael.Timmerberg 2013-05-29 23:16:51 +02:00
commit 0f8fa7ea6c
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/config/hosts.py
View file

@ -12,7 +12,7 @@ class Host:
def getHostServiceByName(self, serviceName): def getHostServiceByName(self, serviceName):
for hostService in self.services: for hostService in self.services:
if serviceName == hostService.service.name: if serviceName == hostService.service.name:
return hostService.service return hostService
return None return None
def __str__(self): def __str__(self):
@ -39,7 +39,8 @@ class HostService:
return self.service.command return self.service.command
def __str__(self): def __str__(self):
ret = str(self.service)
ret = "HostService : " + str(self.service)
if self.warning: if self.warning:
ret += "warning: " + str(self.warning) ret += "warning: " + str(self.warning)
if self.critical: if self.critical:
@ -103,7 +104,7 @@ def parseHostList(hosts, services, log):
replacements.remove('host') replacements.remove('host')
#replacements should be empty now. #replacements should be empty now.
#If not we cannot use this command as some values are missing #If not we cannot use this command as some values are missing
if replacements: if len(replacements) > 0:
log.w("Hostservice " + servicename + " from host " + host.name + " is ignored because of missing replacements: " + str( log.w("Hostservice " + servicename + " from host " + host.name + " is ignored because of missing replacements: " + str(
replacements)) replacements))
else: else:

4
lib/core/job.py
View file

@ -41,7 +41,9 @@ class JobInfo:
def handleCall(self): def handleCall(self):
self.log.d("handle call") self.log.d("handle call")
self.log.d([str(s) for s in self.hostServices]) self.log.d(self.hostServices)
for hs in self.hostServices:
log.d(str(hs))
#must find real service command stored in hosts... #must find real service command stored in hosts...