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

set jobHex to jobInfo

Browse source
This commit is contained in:
Rafael.Timmerberg 2013-10-10 21:59:33 +02:00
commit d885e699ba
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
linspector/core/job.py
View file

@ -51,12 +51,10 @@ class Job:
def set_logger(self, log): def set_logger(self, log):
self.log = log self.log = log
def pretty_string(self): def pretty_string(self):
ret = self.__hex__() ret = self.__hex__()
if ret[0] == "-": if ret[0] == "-":
ret = ret[1:] ret = "0" + ret[1:]
ret += ": (" + str(self.host) + str(self.service) + str(self.job) + ")" ret += ": (" + str(self.host) + str(self.service) + str(self.job) + ")"
return ret[2:] return ret[2:]
@ -84,7 +82,7 @@ class Job:
self.log.debug("handle call") self.log.debug("handle call")
self.log.debug(self.service) self.log.debug(self.service)
try: try:
jobInfo = JobInfo(self.host, self.service) jobInfo = JobInfo(self.__hex__(), self.host, self.service)
self.service._execute(jobInfo) self.service._execute(jobInfo)
jobInfo.set_execution_end() jobInfo.set_execution_end()
@ -99,8 +97,9 @@ class Job:
class JobInfo(object): class JobInfo(object):
def __init__(self, host, service): def __init__(self,jobHex, host, service):
self.id = generateId() self.id = generateId()
self.jobHex = jobHex
self.host = host self.host = host
self.service = service self.service = service
self.executionBegin = datetime.now() self.executionBegin = datetime.now()

2
linspector/services/tcpconnect.py
View file

@ -44,7 +44,7 @@ class TcpconnectService(Service):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
except socket.error, msg: except socket.error, msg:
jobInfo.set_errorcode(2) jobInfo.set_errorcode(2)
jobInfo.set_message("[tcpconnect] Could not create socket to host: " + jobInfo.get_host() + jobInfo.set_message("[tcpconnect: " + jobInfo.jobHex + "] Could not create socket to host: " + jobInfo.get_host() +
" on port: " + str(self.port) + " (" + str(msg) + ")") " on port: " + str(self.port) + " (" + str(msg) + ")")
try: try: