From 8cd39860ae6a1d8d61b360fa7dfd0149a8c6ece9 Mon Sep 17 00:00:00 2001 From: "Rafael.Timmerberg" Date: Thu, 15 Aug 2013 01:26:28 +0200 Subject: [PATCH] added members and processor info to job --- lib/core/job.py | 4 +++- lib/services/tcpconnect.py | 1 - linspector | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/core/job.py b/lib/core/job.py index c543ce8..39873ba 100644 --- a/lib/core/job.py +++ b/lib/core/job.py @@ -14,9 +14,11 @@ def generateId(): class Job: - def __init__(self, service, host): + def __init__(self, service, host, members, processors): self.service = service self.host = host + self.members = members + self.processors = processors self.jobInfos = [] self.jobThreshold = 0 diff --git a/lib/services/tcpconnect.py b/lib/services/tcpconnect.py index 1010b49..971bab2 100644 --- a/lib/services/tcpconnect.py +++ b/lib/services/tcpconnect.py @@ -42,6 +42,5 @@ class TcpconnectService(Service): jobInfo.set_message("Connection successful established to host: " + jobInfo.get_host() + " to port: " + str(self.port)) sock.close() - def create(kwargs): return TcpconnectService(**kwargs) \ No newline at end of file diff --git a/linspector b/linspector index 8b39a0d..ad9c46f 100755 --- a/linspector +++ b/linspector @@ -66,7 +66,7 @@ def main(): for service in hostgroup.get_services(): for host in hostgroup.get_hosts(): for period in service.get_periods(): - job = Job(service, host) + job = Job(service, host, hostgroup.get_members(), hostgroup.get_processors()) schedulerJob = period.createJob(scheduler, job, handleJob) if schedulerJob is not None: job.set_job(schedulerJob)