From 2a3943df334d418d006313da892775324430f567 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Fri, 22 Nov 2013 17:47:58 +0100 Subject: [PATCH] replaced msg argument with job_information in task handler and mail task --- linspector/core/job.py | 10 ++++++---- linspector/tasks/alert/mail.py | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/linspector/core/job.py b/linspector/core/job.py index dd4592b..22e5267 100644 --- a/linspector/core/job.py +++ b/linspector/core/job.py @@ -97,12 +97,12 @@ class Job: logger.info("Job " + self.get_job_id() + ", Threshold reached!") self.status = "ERROR" - def handle_tasks(self, msg): + def handle_tasks(self, job_information): for member in self.members: for task in member.get_tasks(): if self.status.lower() == task.get_task_type().lower(): 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): logger.debug("handle call") @@ -123,7 +123,7 @@ class Job: 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: logger.info("Job " + self.get_job_id() + " disabled") @@ -209,6 +209,8 @@ class JobInformation(object): def inc_job_overall_wins(self): self.job_overall_wins += 1 + def get_response_message(self): + return self.response_massage + def set_response_message(self, msg): - print msg self.response_massage = msg diff --git a/linspector/tasks/alert/mail.py b/linspector/tasks/alert/mail.py index 63b237b..e587846 100644 --- a/linspector/tasks/alert/mail.py +++ b/linspector/tasks/alert/mail.py @@ -59,11 +59,11 @@ class MailTask(Task): # ...and so on for all possible args - def execute(self, msg): + def execute(self, job_information): logger.debug("Executing Mail Task!") - message = MIMEText(msg) - message['Subject'] = msg + message = MIMEText(job_information.get_response_message()) + message['Subject'] = job_information.get_response_message() now = datetime.datetime.now() message['Date'] = now.strftime("%a, %d %b %Y %H:%M:%S") message['From'] = self.sender