don't encode the job id into message string, send it as an separate argument

5 files changed, 25 insertions, 14 deletions

diff --git a/src/Daemon/CommLayerServer.h b/src/Daemon/CommLayerServer.h
index 2808f8a8..ededee5a 100644
--- a/src/Daemon/CommLayerServer.h
+++ b/src/Daemon/CommLayerServer.h
@@ -14,9 +14,10 @@ class CCommLayerServer {
         virtual void Crash(const std::string& progname, const std::string& uid) {}
         virtual void AnalyzeComplete(const map_crash_report_t& arg1) {}
         virtual void Error(const std::string& arg1) {}
-        virtual void Update(const std::string& pDest, const std::string& pMessage) {};
+        virtual void Update(const std::string& pMessage, uint64_t pJobID) {};
         virtual void Warning(const std::string& pMessage) {};
         virtual void JobDone(const std::string &pDest, uint64_t pJobID) {};
+        virtual void Warning(const std::string& pMessage, uint64_t pJobID) {};
 };
 
 #endif //COMMLAYERSERVER_H_
diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp
index dd1a01e4..d3e157d4 100644
--- a/src/Daemon/CommLayerServerDBus.cpp
+++ b/src/Daemon/CommLayerServerDBus.cpp
@@ -238,12 +238,12 @@ void CCommLayerServerDBus::Error(const std::string& arg1)
     emit_signal(sig);
 }
 
-void CCommLayerServerDBus::Update(const std::string& pDest, const std::string& pMessage)
+void CCommLayerServerDBus::Update(const std::string& pMessage, uint64_t pJobID)
 {
     ::DBus::SignalMessage sig("Update");
     ::DBus::MessageIter wi = sig.writer();
-    wi << pDest;
     wi << pMessage;
+    wi << pJobID;
     emit_signal(sig);
 }
 
@@ -254,3 +254,12 @@ void CCommLayerServerDBus::Warning(const std::string& arg1)
     wi << arg1;
     emit_signal(sig);
 }
+
+void CCommLayerServerDBus::Warning(const std::string& pMessage, uint64_t pJobID)
+{
+    ::DBus::SignalMessage sig("Warning");
+    ::DBus::MessageIter wi = sig.writer();
+    wi << pMessage;
+    wi << pJobID;
+    emit_signal(sig);
+}
diff --git a/src/Daemon/CommLayerServerDBus.h b/src/Daemon/CommLayerServerDBus.h
index 38450aa2..a3b54a7a 100644
--- a/src/Daemon/CommLayerServerDBus.h
+++ b/src/Daemon/CommLayerServerDBus.h
@@ -37,9 +37,10 @@ class CCommLayerServerDBus
         virtual void Crash(const std::string& progname, const std::string& uid);
         virtual void AnalyzeComplete(const map_crash_report_t& arg1);
         virtual void Error(const std::string& arg1);
-        virtual void Update(const std::string& pDest, const std::string& pMessage);
+        virtual void Update(const std::string& pMessage, uint64_t pJobID);
         virtual void JobDone(const std::string& pDest, uint64_t pJobID);
         virtual void Warning(const std::string& pMessage);
+        virtual void Warning(const std::string& pMessage, uint64_t pJobID);
 };
 
 /*
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 4473659e..27131799 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -24,19 +24,19 @@
 #include "ABRTException.h"
 #include "CrashWatcher.h"
 
-void CCrashWatcher::Status(const std::string& pMessage, const std::string& pDest)
+void CCrashWatcher::Status(const std::string& pMessage, uint64_t pJobID)
 {
     log("Update: %s", pMessage.c_str());
     //FIXME: send updates only to job owner
     if (g_pCommLayer != NULL)
-        g_pCommLayer->Update(pDest, pMessage);
+        g_pCommLayer->Update(pMessage, pJobID);
 }
 
-void CCrashWatcher::Warning(const std::string& pMessage)
+void CCrashWatcher::Warning(const std::string& pMessage, uint64_t pJobID)
 {
     log("Warning: %s", pMessage.c_str());
     if (g_pCommLayer != NULL)
-        g_pCommLayer->Warning(pMessage);
+        g_pCommLayer->Warning(pMessage, pJobID);
 }
 
 void CCrashWatcher::Debug(const std::string& pMessage)
@@ -142,17 +142,17 @@ static void *create_report(void *arg)
             case MW_OK:
                 break;
             case MW_IN_DB_ERROR:
-                g_cw->Warning(std::string("Did not find crash with UUID ")+thread_data->UUID+ " in database.");
+                g_cw->Warning(std::string("Did not find crash with UUID ")+thread_data->UUID+ " in database.",(uint64_t)thread_data->thread_id);
                 break;
             case MW_PLUGIN_ERROR:
-                g_cw->Warning(std::string("Particular analyzer plugin isn't loaded or there is an error within plugin(s)."));
+                g_cw->Warning(std::string("Particular analyzer plugin isn't loaded or there is an error within plugin(s)."),(uint64_t)thread_data->thread_id);
                 break;
             case MW_CORRUPTED:
             case MW_FILE_ERROR:
             default:
                 {
                     std::string debugDumpDir;
-                    g_cw->Warning(std::string("Corrupted crash with UUID ")+thread_data->UUID+", deleting.");
+                    g_cw->Warning(std::string("Corrupted crash with UUID ")+thread_data->UUID+", deleting.",(uint64_t)thread_data->thread_id);
                     debugDumpDir = DeleteCrashInfo(thread_data->UUID, thread_data->UID);
                     DeleteDebugDumpDir(debugDumpDir);
                 }
@@ -175,7 +175,7 @@ static void *create_report(void *arg)
             free(thread_data);
             throw e;
         }
-        g_cw->Warning(e.what());
+        g_cw->Warning(e.what(),(uint64_t)thread_data->thread_id);
     }
     /* free strduped strings */
     free(thread_data->UUID);
diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h
index bf82a30b..b2e5341b 100644
--- a/src/Daemon/CrashWatcher.h
+++ b/src/Daemon/CrashWatcher.h
@@ -50,9 +50,9 @@ class CCrashWatcher
 
     public:
         /* Observer methods */
-        virtual void Status(const std::string& pMessage, const std::string& pDest="0");
+        virtual void Status(const std::string& pMessage, uint64_t pJobID=0);
         virtual void Debug(const std::string& pMessage);
-        virtual void Warning(const std::string& pMessage);
+        virtual void Warning(const std::string& pMessage, uint64_t pJobID=0);
 };
 
 vector_crash_infos_t GetCrashInfos(const std::string &pUID);