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

bugfixes for jobExecution

Browse source
This commit is contained in:
RafTim 2013-11-11 01:44:29 +01:00
commit 8b59c43de1
2 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

45
linspector/core/job.py
View file

@ -104,33 +104,33 @@ class Job:
logger.info("Job " + self.hex_string() + ", Threshold reached!") logger.info("Job " + self.hex_string() + ", Threshold reached!")
self.status = "ERROR" self.status = "ERROR"
self.handle_alarm() def handle_tasks(self, msg):
def handle_alarm(self):
for member in self.members: for member in self.members:
for task in member.get_tasks(): for task in member.get_tasks():
if self.status.lower() == task.get_task_type_name(): if self.status.lower() == task.get_task_type_name():
logger.debug("Executing Task of type: " + self.status) logger.debug("Executing Task of type: " + self.status)
TaskExecutor.Instance().schedule_task(self.get_response_message(), task) TaskExecutor.Instance().schedule_task(msg, task)
def handle_call(self): def handle_call(self):
logger.debug("handle call") logger.debug("handle call")
logger.debug(self.service) logger.debug(self.service)
if self.enabled: if self.enabled:
self.last_execution = None
try: try:
execution = JobExecution() self.last_execution = JobExecution(self.get_host())
self.service.execute(execution) self.service.execute(self.last_execution)
except Exception, e: except Exception, e:
logger.debug(e) logger.debug(e)
execution.set_execution_end()
self.handle_threshold(self.service.get_threshold(), execution.was_successful()) self.last_execution.set_execution_end()
self.handle_threshold(self.service.get_threshold(), self.last_execution.was_successful())
logger.info("Job " + self.hex_string() + logger.info("Job " + self.hex_string() +
", Code: " + str(execution.get) + ", Code: " + str(self.last_execution.get_error_code()) +
", Message: " + str(self.get_message())) ", Message: " + str(self.last_execution.get_message()))
self.handle_tasks(self.last_execution.get_response_message(self))
else: else:
logger.info("Job " + self.hex_string() + " disabled") logger.info("Job " + self.hex_string() + " disabled")
def get_host(self): def get_host(self):
return self.host return self.host
@ -138,20 +138,14 @@ class Job:
return self.hostgroup return self.hostgroup
class JobExecution(object): class JobExecution(object):
def __init__(self, host): def __init__(self, host):
self.execution_start = datetime.now() self.execution_start = datetime.now()
self.execution_end = -1 self.execution_end = -1
self.host = host self.host = host
self.error_code = -1 self.error_code = -1
self.message = "" self.message = None
self.kwargs = {} self.kwargs = None
def get_host_name(self): def get_host_name(self):
return self.host return self.host
@ -171,14 +165,17 @@ class JobExecution(object):
def was_successful(self): def was_successful(self):
return self.get_error_code() == 0 return self.get_error_code() == 0
def set_result(self, error_code=0, message="", **kwargs): def set_result(self, error_code=0, message="", kwargs=None):
self.error_code = error_code self.error_code = error_code
self.message = message self.message = message
self.kwargs = kwargs self.kwargs = kwargs
def get_response_message(self, job): def get_response_message(self, job):
return str(job.status) + " [CLASS: " + str(job.jobHex) + "] " + \ msg = str(job.status) + " [CLASS: " + str(job.jobHex) + "] " + \
str(self.get_hostgroup()) + " " + str(self.get_host()) + \ str(job.get_hostgroup()) + " " + str(job.get_host())
" Message:" + str(self.get_message()) + " " + str(self.get_kwargs()) if self.get_message() is not None:
msg += " Message:" + str(self.get_message())
if self.get_kwargs() is not None:
msg += " " + str(self.get_kwargs())
return msg

2
linspector/services/etc/dummy.py
View file

@ -75,7 +75,7 @@ class DummyService(Service):
if self.fail: if self.fail:
error_code = 1 error_code = 1
msg = "Failed" msg = "Failed"
execution.set_result(error_code, msg, *d) execution.set_result(error_code, msg, d)