From 1f75340e59f2caf8294e288437fb25fcc5ce1a87 Mon Sep 17 00:00:00 2001
From: Johannes Findeisen <you@hanez.org>
Date: Mon, 11 Nov 2013 00:04:02 +0100
Subject: [PATCH] some new idea of message creation in services

---
 linspector/core/job.py           | 19 +++++++++++++++++--
 linspector/services/etc/dummy.py | 12 ++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/linspector/core/job.py b/linspector/core/job.py
index 49ac703..28deb28 100644
--- a/linspector/core/job.py
+++ b/linspector/core/job.py
@@ -59,6 +59,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
 
     def __str__(self):
         return str(self.__dict__)
@@ -116,7 +117,7 @@ class Job:
             for task in member.get_tasks():
                 if self.status.lower() == task.get_task_type_name():
                     logger.debug("Executing Task of type: " + self.status)
-                    TaskExecutor.Instance().schedule_task(self.status + " " + self.get_message(), task)
+                    TaskExecutor.Instance().schedule_task(self.get_response_message(), task)
 
     def handle_call(self):
         logger.debug("handle call")
@@ -143,9 +144,18 @@ class Job:
     def get_host(self):
         return self.host
 
+    def get_hostgroup(self):
+        return self.hostgroup
+
     def set_result(self, result):
         self.result = result
 
+    def get_response(self):
+        return self.response
+
+    def set_response(self, response):
+        self.response = response
+
     def set_execution_end(self):
         self.execution_end = datetime.now()
 
@@ -165,4 +175,9 @@ class Job:
         self.errorcode = errcode
 
     def get_errorcode(self):
-        return self.errorcode
\ No newline at end of file
+        return self.errorcode
+
+    def get_response_message(self):
+        message = str(self.status) + " [CLASS: " + str(self.jobHex) + "] " + \
+            str(self.get_hostgroup) + " " + str(self.get_host()) + " " + str(self.get_response())
+        return message
\ No newline at end of file
diff --git a/linspector/services/etc/dummy.py b/linspector/services/etc/dummy.py
index b273bb7..fc0df03 100644
--- a/linspector/services/etc/dummy.py
+++ b/linspector/services/etc/dummy.py
@@ -71,14 +71,18 @@ class DummyService(Service):
 
         if self.fail:
             job.set_errorcode(1)
-            job.set_message("[etc/dummy: " + job.jobHex + "] Failed on host: " + job.get_host() +
-                            " Sleep: " + str(self.sleep) + " Fail: " + str(self.fail))
+            #job.set_message("[etc/dummy: " + job.jobHex + "] Failed on host: " + job.get_host() +
+            #                " Sleep: " + str(self.sleep) + " Fail: " + str(self.fail))
+
+            job.set_response({"Message": "Failed", "Sleep": str(self.sleep), "Fail": str(self.fail)})
 
         if job.get_errorcode() == -1:
             job.set_execution_successful(True)
             job.set_errorcode(0)
-            job.set_message("[etc/dummy: " + job.jobHex + "] Success on host: " + job.get_host() +
-                            " Sleep: " + str(self.sleep) + " Fail: " + str(self.fail))
+            #job.set_message("[etc/dummy: " + job.jobHex + "] Success on host: " + job.get_host() +
+            #                " Sleep: " + str(self.sleep) + " Fail: " + str(self.fail))
+
+            job.set_response({"Message": "Success", "Sleep": str(self.sleep), "Fail": str(self.fail)})
 
 
 def create(kwargs):