From 97b3d6a5ba093ce2708c2bb4c85b3a0c8731b395 Mon Sep 17 00:00:00 2001 From: RafTim Date: Mon, 11 Nov 2013 02:21:16 +0100 Subject: [PATCH] cleanup --- linspector/core/job.py | 4 ++-- linspector/services/etc/dummy.py | 1 - linspector/services/service.py | 1 - linspector/tasks/task.py | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/linspector/core/job.py b/linspector/core/job.py index 7543698..2b5d53f 100644 --- a/linspector/core/job.py +++ b/linspector/core/job.py @@ -53,7 +53,7 @@ class Job: UNKNOWN when a job throws an exception which is not handled by the job itself (not implemented) """ self.status = "NONE" - self.response = None + self.last_execution = None def __str__(self): return str(self.__dict__) @@ -171,7 +171,7 @@ class JobExecution(object): self.kwargs = kwargs def get_response_message(self, job): - msg = str(job.status) + " [CLASS: " + str(job.jobHex) + "] " + \ + msg = str(job.status) + " [" + job.service.get_config_name() + ": " + str(job.jobHex) + "] " + \ str(job.get_hostgroup()) + " " + str(job.get_host()) if self.get_message() is not None: msg += " Message:" + str(self.get_message()) diff --git a/linspector/services/etc/dummy.py b/linspector/services/etc/dummy.py index 47dd665..4d32c05 100644 --- a/linspector/services/etc/dummy.py +++ b/linspector/services/etc/dummy.py @@ -78,6 +78,5 @@ class DummyService(Service): execution.set_result(error_code, msg, d) - def create(kwargs): return DummyService(**kwargs) \ No newline at end of file diff --git a/linspector/services/service.py b/linspector/services/service.py index 59957bc..66910e0 100644 --- a/linspector/services/service.py +++ b/linspector/services/service.py @@ -31,7 +31,6 @@ logger = getLogger(__name__) class Service(object): def __init__(self, **kwargs): - self.name = None self._args = {} if KEY_ARGS in kwargs: self.add_arguments(kwargs[KEY_ARGS]) diff --git a/linspector/tasks/task.py b/linspector/tasks/task.py index b2f77c7..d5d1e60 100644 --- a/linspector/tasks/task.py +++ b/linspector/tasks/task.py @@ -32,7 +32,6 @@ logger = getLogger(__name__) class Task(object): def __init__(self, **kwargs): - self._args = {} if KEY_ARGS in kwargs: self.add_arguments(kwargs[KEY_ARGS])