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

replaced msg argument with job_information in task handler and mail task

Browse source
This commit is contained in:
Johannes Findeisen 2013-11-22 17:47:58 +01:00
commit 2a3943df33
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
linspector/core/job.py
View file

@ -97,12 +97,12 @@ class Job:
logger.info("Job " + self.get_job_id() + ", Threshold reached!") logger.info("Job " + self.get_job_id() + ", Threshold reached!")
self.status = "ERROR" self.status = "ERROR"
def handle_tasks(self, msg): def handle_tasks(self, job_information):
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().lower(): if self.status.lower() == task.get_task_type().lower():
logger.debug("Executing Task of type: " + self.status) logger.debug("Executing Task of type: " + self.status)
TaskExecutor.Instance().schedule_task(msg, task) TaskExecutor.Instance().schedule_task(job_information, task)
def handle_call(self): def handle_call(self):
logger.debug("handle call") logger.debug("handle call")
@ -123,7 +123,7 @@ class Job:
self.job_information.set_response_message(self.last_execution.get_response_message(self)) self.job_information.set_response_message(self.last_execution.get_response_message(self))
self.handle_tasks(self.last_execution.get_response_message(self)) self.handle_tasks(self.job_information)
else: else:
logger.info("Job " + self.get_job_id() + " disabled") logger.info("Job " + self.get_job_id() + " disabled")
@ -209,6 +209,8 @@ class JobInformation(object):
def inc_job_overall_wins(self): def inc_job_overall_wins(self):
self.job_overall_wins += 1 self.job_overall_wins += 1
def get_response_message(self):
return self.response_massage
def set_response_message(self, msg): def set_response_message(self, msg):
print msg
self.response_massage = msg self.response_massage = msg

6
linspector/tasks/alert/mail.py
View file

@ -59,11 +59,11 @@ class MailTask(Task):
# ...and so on for all possible args # ...and so on for all possible args
def execute(self, msg): def execute(self, job_information):
logger.debug("Executing Mail Task!") logger.debug("Executing Mail Task!")
message = MIMEText(msg) message = MIMEText(job_information.get_response_message())
message['Subject'] = msg message['Subject'] = job_information.get_response_message()
now = datetime.datetime.now() now = datetime.datetime.now()
message['Date'] = now.strftime("%a, %d %b %Y %H:%M:%S") message['Date'] = now.strftime("%a, %d %b %Y %H:%M:%S")
message['From'] = self.sender message['From'] = self.sender