diff --git a/linspector/core/job.py b/linspector/core/job.py index 616d84c..ed9064f 100644 --- a/linspector/core/job.py +++ b/linspector/core/job.py @@ -51,12 +51,10 @@ class Job: def set_logger(self, log): self.log = log - - def pretty_string(self): ret = self.__hex__() if ret[0] == "-": - ret = ret[1:] + ret = "0" + ret[1:] ret += ": (" + str(self.host) + str(self.service) + str(self.job) + ")" return ret[2:] @@ -84,7 +82,7 @@ class Job: self.log.debug("handle call") self.log.debug(self.service) try: - jobInfo = JobInfo(self.host, self.service) + jobInfo = JobInfo(self.__hex__(), self.host, self.service) self.service._execute(jobInfo) jobInfo.set_execution_end() @@ -99,8 +97,9 @@ class Job: class JobInfo(object): - def __init__(self, host, service): + def __init__(self,jobHex, host, service): self.id = generateId() + self.jobHex = jobHex self.host = host self.service = service self.executionBegin = datetime.now() diff --git a/linspector/services/tcpconnect.py b/linspector/services/tcpconnect.py index 63bb028..2bfcf70 100644 --- a/linspector/services/tcpconnect.py +++ b/linspector/services/tcpconnect.py @@ -44,7 +44,7 @@ class TcpconnectService(Service): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) except socket.error, msg: 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) + ")") try: