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

2 files changed, 4 insertions, 6 deletions

diff --git a/lib/CommLayer/CommLayerInner.cpp b/lib/CommLayer/CommLayerInner.cpp
index 1a58814f..ec4dc904 100644
--- a/lib/CommLayer/CommLayerInner.cpp
+++ b/lib/CommLayer/CommLayerInner.cpp
@@ -18,8 +18,7 @@ void warn_client(const std::string& pMessage)
     pthread_t self = pthread_self();
     if (self != s_main_id)
     {
-        std::string s = ssprintf("%%%llx: %s", (unsigned long long)self, pMessage.c_str());
-        s_pObs->Warning(s);
+        s_pObs->Warning(pMessage,(uint64_t)self);
 //log("w: '%s'", s.c_str());
     }
     else
@@ -38,8 +37,7 @@ void update_client(const std::string& pMessage)
     pthread_t self = pthread_self();
     if (self != s_main_id)
     {
-        std::string s = ssprintf("%%%llx: %s", (unsigned long long)self, pMessage.c_str());
-        s_pObs->Status(s);
+        s_pObs->Status(pMessage, (uint64_t)self);
 //log("u: '%s'", s.c_str());
     }
     else
diff --git a/lib/CommLayer/Observer.h b/lib/CommLayer/Observer.h
index f60fde45..928c78a3 100644
--- a/lib/CommLayer/Observer.h
+++ b/lib/CommLayer/Observer.h
@@ -9,9 +9,9 @@
 class CObserver {
     public:
         virtual ~CObserver() {}
-        virtual void Status(const std::string& pMessage, const std::string& pDest="0") = 0;
+        virtual void Status(const std::string& pMessage, uint64_t pDest=0) = 0;
         virtual void Debug(const std::string& pMessage) = 0;
-        virtual void Warning(const std::string& pMessage) = 0;
+        virtual void Warning(const std::string& pMessage, uint64_t pDest=0) = 0;
 };
 
 #endif