HPCC-21528 ESP - Make sure audience and message class is sensible

Signed-off-by: Shamser Ahmed <shamser.ahmed@lexisnexis.co.uk>

esp/bindings/SOAP/Platform/soapbind.cpp

@@ -416,7 +416,7 @@ void CSoapResponseBinding::handleExceptions(IMultiException *me, const char *ser
         StringBuffer text;
         me->errorMessage(text);
         text.append('\n');
-        WARNLOG("Exception(s) in %s::%s - %s", serv, meth, text.str());
+        IWARNLOG("Exception(s) in %s::%s - %s", serv, meth, text.str());
 
         IArrayOf<IException>& exceptions = me->getArray();
         ForEachItemIn(i, exceptions)

esp/bindings/SOAP/Platform/soapmessage.cpp

@@ -378,7 +378,7 @@ bool CRpcResponse::handleExceptions(IXslProcessor *xslp, IMultiException *me, co
         StringBuffer text;
         me->errorMessage(text);
         text.append('\n');
-        WARNLOG("Exception(s) in %s::%s - %s", serv, meth, text.str());
+        IWARNLOG("Exception(s) in %s::%s - %s", serv, meth, text.str());
 
         if (errorXslt)
         {

esp/bindings/SOAP/Platform/soapservice.cpp

@@ -79,7 +79,7 @@ int CSoapService::processHeader(CHeader* header, IEspContext* ctx)
                     }
                     if(user == NULL)
                     {
-                        WARNLOG("Couldn't create ISecUser object for %s", username.str());
+                        IWARNLOG("Couldn't create ISecUser object for %s", username.str());
                     }
                     user->setName(username.str());
                     user->credentials().setPassword(password.str());
@@ -243,7 +243,7 @@ int CSoapService::processRequest(ISoapMessage &req, ISoapMessage& resp)
         } catch (...) {
             response.set_status(SOAP_CLIENT_ERROR);
             response.set_err("Unknown error when parsing soap body XML");
-            ERRLOG("SOAP request from %s@%s. Unknown error when parsing: %s",  (userId&&*userId)?userId:"unknown",
+            IERRLOG("SOAP request from %s@%s. Unknown error when parsing: %s",  (userId&&*userId)?userId:"unknown",
                 (peerStr.length()>0)?peerStr.str():"unknown", requeststr.str());
             return 0;
         }

esp/bindings/SOAP/client/soapclient.cpp

@@ -234,7 +234,7 @@ int CSoapClient::postRequest(const char* contenttype, const char* soapaction, IR
     }
     else
     {
-        DBGLOG("SOAP Response type %s not supported", soap_response->get_content_type());
+        UWARNLOG("SOAP Response type %s not supported", soap_response->get_content_type());
         return SOAP_REQUEST_TYPE_ERROR;
     }
 

esp/bindings/SOAP/ws_ecl_client/ws_ecl_client_bind.hpp

@@ -142,7 +142,7 @@ public:
             if (*start == '<')
                 soapNS.append(sptr-start-1,start+1);
             else if (strstr(value,"<Envelope") == NULL)
-                ERRLOG("Parsing soap namespace failed");
+                UERRLOG("Parsing soap namespace failed");
         }
 
         // save soap body
@@ -154,7 +154,7 @@ public:
             while (*sptr && *sptr!='>')
                 sptr++; 
             if (*sptr!='>') {
-                DBGLOG("Parsing soap message error: could not find ending > for Body");
+                UWARNLOG("Parsing soap message error: could not find ending > for Body");
                 return;
             }
             sptr++; // skip '>'

esp/bindings/http/client/httpclient.cpp

@@ -258,7 +258,7 @@ int CHttpClient::connect(StringBuffer& errmsg, bool forceNewConnection)
         if (!ep.set(m_host.get(), m_port))
         {
             errmsg.appendf("Bad host name/ip: %s", m_host.get());
-            ERRLOG("%s", errmsg.str());
+            UERRLOG("%s", errmsg.str());
             return -1;
         }
         //TODO: should it be 443 for HTTPS??
@@ -270,7 +270,7 @@ int CHttpClient::connect(StringBuffer& errmsg, bool forceNewConnection)
         if (!ep.set(m_proxy.str()))
         {
             errmsg.appendf("Bad proxy name/ip: %s", m_proxy.str());
-            ERRLOG("%s", errmsg.str());
+            UERRLOG("%s", errmsg.str());
             return -1;
         }
         //TODO: should it be 443 for HTTPS??
@@ -315,7 +315,7 @@ int CHttpClient::connect(StringBuffer& errmsg, bool forceNewConnection)
         catch(IException *e)
         {
             StringBuffer url;
-            ERRLOG("Error connecting to %s", ep.getUrlStr(url).str());
+            UERRLOG("Error connecting to %s", ep.getUrlStr(url).str());
             DBGLOG(e);
             e->Release();
             m_socket = nullptr;
@@ -324,7 +324,7 @@ int CHttpClient::connect(StringBuffer& errmsg, bool forceNewConnection)
         catch(...)
         {
             StringBuffer url;
-            ERRLOG("Unknown exception connecting to %s", ep.getUrlStr(url).str());
+            UERRLOG("Unknown exception connecting to %s", ep.getUrlStr(url).str());
             m_socket = nullptr;
             return -1;
         }

esp/bindings/http/platform/httpbinding.cpp

@@ -216,7 +216,7 @@ EspHttpBinding::EspHttpBinding(IPropertyTree* tree, const char *bindname, const
                                 lscfg.setown(proc_cfg->getPropTree(StringBuffer("ldapSecurity[@name=").appendf("\"%s\"]", lsname.str()).str()));
                             if(lscfg == NULL)
                             {
-                                ERRLOG("can't find bnd_cfg for LdapSecurity %s", lsname.str());
+                                OERRLOG("can't find bnd_cfg for LdapSecurity %s", lsname.str());
                                 throw MakeStringException(-1, "can't find bnd_cfg for LdapSecurity %s", lsname.str());
                             }
                         }
@@ -649,7 +649,7 @@ void EspHttpBinding::populateRequest(CHttpRequest *request)
     ISecUser *user = m_secmgr->createUser(userid.str());
     if(user == NULL)
     {
-        WARNLOG("Couldn't create ISecUser object for %s", userid.str());
+        UWARNLOG("Couldn't create ISecUser object for %s", userid.str());
         return;
     }
 
@@ -706,7 +706,7 @@ bool EspHttpBinding::basicAuth(IEspContext* ctx)
     ISecUser *user = ctx->queryUser();
     if(user == NULL)
     {
-        WARNLOG("Can't find user in context");
+        UWARNLOG("Can't find user in context");
         ctx->setAuthError(EspAuthErrorUserNotFoundInContext);
         ctx->AuditMessage(AUDIT_TYPE_ACCESS_FAILURE, "Authentication", "Access Denied: No username provided");
         return false;
@@ -735,7 +735,7 @@ bool EspHttpBinding::basicAuth(IEspContext* ctx)
 
     if(m_secmgr.get() == NULL)
     {
-        WARNLOG("No mechanism established for authentication");
+        UWARNLOG("No mechanism established for authentication");
         ctx->setAuthError(EspAuthErrorNoAuthMechanism);
         return false;
     }
@@ -743,7 +743,7 @@ bool EspHttpBinding::basicAuth(IEspContext* ctx)
     ISecResourceList* rlist = ctx->queryResources();
     if(rlist == NULL)
     {
-        WARNLOG("No Security Resource");
+        UWARNLOG("No Security Resource");
         ctx->setAuthError(EspAuthErrorEmptySecResource);
         return false;
     }
@@ -1088,7 +1088,7 @@ static void filterXmlBySchema(IPTree* in, IXmlType* type, const char* tag, Strin
         {
             VStringBuffer s("*** Invalid array definition: tag=%s, itemName=%s", tag, itemName?itemName:"NULL");
             out.append(s);
-            ERRLOG("%s", s.str());
+            IERRLOG("%s", s.str());
             return;
         }
 
@@ -1147,7 +1147,7 @@ static void filterXmlBySchema(StringBuffer& in, StringBuffer& schema, const char
     else 
     {
         const char* value = tree->queryProp(NULL);
-        DBGLOG("Unknown xml tag ignored: <%s>%s</%s>", name, value?value:"", name);
+        UWARNLOG("Unknown xml tag ignored: <%s>%s</%s>", name, value?value:"", name);
     }
 }
 
@@ -1242,7 +1242,7 @@ static void filterXmlBySchema(IPTree* in, IXmlType* type, const char* tag, Strin
         {
             VStringBuffer s("*** Invalid array definition: tag=%s, indent=%d, itemName=%s", tag, indent,itemName?itemName:"NULL");
             out.append(s);
-            ERRLOG(s);
+            IERRLOG(s);
             return;
         }
 
@@ -1544,7 +1544,7 @@ int EspHttpBinding::onGetConfig(IEspContext &context, CHttpRequest* request, CHt
         response->send();
         return 0;
     }
-    DBGLOG("Config access denied");
+    OERRLOG("Config access denied");
     return onGetNotFound(context, request, response, NULL);
 }
 
@@ -2047,7 +2047,7 @@ int EspHttpBinding::onFinishUpload(IEspContext &ctx, CHttpRequest* request, CHtt
     else
     {
         StringBuffer msg;
-        WARNLOG("Exception(s) in EspHttpBinding::onFinishUpload - %s", me->errorMessage(msg).append('\n').str());
+        IWARNLOG("Exception(s) in EspHttpBinding::onFinishUpload - %s", me->errorMessage(msg).append('\n').str());
         content.appendf("<br/><b>%s</b>", msg.str());
     }
     content.append("</div>"
@@ -2740,7 +2740,7 @@ void EspHttpBinding::validateResponse(IEspContext& context, CHttpRequest* reques
         }
     } catch (IException* e) {
         StringBuffer msg;
-        DBGLOG("Unexpected error: parsing XML: %s", e->errorMessage(msg).str());
+        IERRLOG("Unexpected error: parsing XML: %s", e->errorMessage(msg).str());
     }
 
     // schema
@@ -2803,6 +2803,6 @@ void EspHttpBinding::sortResponse(IEspContext& context, CHttpRequest* request, M
         content.setBuffer(len, result.detach(), true);      
     } catch (IException* e) {
         StringBuffer msg;
-        DBGLOG("Unexpected error: parsing XML: %s", e->errorMessage(msg).str());
+        IERRLOG("Unexpected error: parsing XML: %s", e->errorMessage(msg).str());
     }
 }

esp/bindings/http/platform/httpprot.cpp

@@ -171,7 +171,7 @@ bool CHttpProtocol::notifySelected(ISocket *sock,unsigned selected, IPersistentH
                     }
                     catch(...)
                     {
-                        ERRLOG("Error starting thread from http thread pool.");
+                        IERRLOG("Error starting thread from http thread pool.");
                         if(accepted.get())
                         {
                             accepted->close();
@@ -205,12 +205,12 @@ bool CHttpProtocol::notifySelected(ISocket *sock,unsigned selected, IPersistentH
     catch (IException *e) 
     {
         StringBuffer estr;
-        ERRLOG("Exception(%d, %s) in CHttpProtocol::notifySelected()", e->errorCode(), e->errorMessage(estr).str());
+        IERRLOG("Exception(%d, %s) in CHttpProtocol::notifySelected()", e->errorCode(), e->errorMessage(estr).str());
         e->Release();
     }
     catch(...)
     {
-        ERRLOG("Unknown Exception in CHttpProtocol::notifySelected()");
+        IERRLOG("Unknown Exception in CHttpProtocol::notifySelected()");
     }
 
     return false;
@@ -378,12 +378,12 @@ bool CSecureHttpProtocol::notifySelected(ISocket *sock,unsigned selected, IPersi
     catch (IException *e) 
     {
         StringBuffer estr;
-        ERRLOG("Exception(%d, %s) in CSecureHttpProtocol::notifySelected()", e->errorCode(), e->errorMessage(estr).str());
+        IERRLOG("Exception(%d, %s) in CSecureHttpProtocol::notifySelected()", e->errorCode(), e->errorMessage(estr).str());
         e->Release();
     }
     catch(...)
     {
-        ERRLOG("Unknown Exception in CSecureHttpProtocol::notifySelected()");
+        IERRLOG("Unknown Exception in CSecureHttpProtocol::notifySelected()");
     }
 
     return false;
@@ -455,12 +455,12 @@ bool CHttpThread::onRequest()
         {
             StringBuffer emsg;
             e->errorMessage(emsg);
-            DBGLOG("%s", emsg.str());
+            IERRLOG("%s", emsg.str());
             return false;
         }
         catch(...)
         {
-            DBGLOG("Unknown exception accepting from secure socket");
+            IERRLOG("Unknown exception accepting from secure socket");
             return false;
         }
         ESPLOG(LogMax, "Request from secure socket");
@@ -535,7 +535,7 @@ void CPooledHttpThread::threadmain()
         {
             StringBuffer emsg;
             e->errorMessage(emsg);
-            DBGLOG("%s", emsg.str());
+            IERRLOG("%s", emsg.str());
             return;
         }
         catch(...)
@@ -572,12 +572,12 @@ void CPooledHttpThread::threadmain()
     catch (IException *e) 
     {
         StringBuffer estr;
-        ERRLOG("Exception(%d, %s) in CPooledHttpThread::threadmain().", e->errorCode(), e->errorMessage(estr).str());
+        IERRLOG("Exception(%d, %s) in CPooledHttpThread::threadmain().", e->errorCode(), e->errorMessage(estr).str());
         e->Release();
     }
     catch(...)
     {
-        ERRLOG("General Exception - in CPooledHttpThread::threadmain().");
+        IERRLOG("General Exception - in CPooledHttpThread::threadmain().");
     }
     clearThreadLocal();
 
@@ -593,12 +593,12 @@ void CPooledHttpThread::threadmain()
     catch (IException *e) 
     {
         StringBuffer estr;
-        ERRLOG("Exception(%d, %s) - CPooledHttpThread::threadmain(), closing socket.", e->errorCode(), e->errorMessage(estr).str());
+        IERRLOG("Exception(%d, %s) - CPooledHttpThread::threadmain(), closing socket.", e->errorCode(), e->errorMessage(estr).str());
         e->Release();
     }
     catch(...)
     {
-        ERRLOG("General Exception - CPooledHttpThread::threadmain(), closing socket.");
+        IERRLOG("General Exception - CPooledHttpThread::threadmain(), closing socket.");
     }
 
 }

esp/bindings/http/platform/httpservice.cpp

@@ -89,7 +89,7 @@ CEspHttpServer::~CEspHttpServer()
     }
     catch (...)
     {
-        ERRLOG("In CEspHttpServer::~CEspHttpServer() -- Unknown Exception.");
+        IERRLOG("In CEspHttpServer::~CEspHttpServer() -- Unknown Exception.");
     }
 }
 
@@ -137,7 +137,7 @@ static bool authenticateOptionalFailed(IEspContext& ctx, IEspHttpBinding* bindin
         if(!user || user->getStatus()==SecUserStatus_Inhouse || user->getStatus()==SecUserStatus_Unknown)
             return false;
 
-        ERRLOG("User %s trying to access unauthorized feature: internal", user->getName() ? user->getName() : ctx.queryUserId());
+        OERRLOG("User %s trying to access unauthorized feature: internal", user->getName() ? user->getName() : ctx.queryUserId());
         return true;
     }
     // TODO: handle binding specific optionals
@@ -200,7 +200,7 @@ int CEspHttpServer::processRequest()
     }
     catch (...)
     {
-        DBGLOG("Unknown Exception - reading request [CEspHttpServer::processRequest()]");
+        IERRLOG("Unknown Exception - reading request [CEspHttpServer::processRequest()]");
         return 0;
     }
 
@@ -404,8 +404,8 @@ int CEspHttpServer::processRequest()
     {
         StringBuffer content_type;
         __int64 len = m_request->getContentLength();
-        DBGLOG("Unknown Exception - processing request");
-        DBGLOG("METHOD: %s, PATH: %s, TYPE: %s, CONTENT-LENGTH: %" I64F "d", m_request->queryMethod(), m_request->queryPath(), m_request->getContentType(content_type).str(), len);
+        UWARNLOG("Unknown Exception - processing request");
+        UWARNLOG("METHOD: %s, PATH: %s, TYPE: %s, CONTENT-LENGTH: %" I64F "d", m_request->queryMethod(), m_request->queryPath(), m_request->getContentType(content_type).str(), len);
         if (len > 0)
             m_request->logMessage(LOGCONTENT, "HTTP request content received:\n");
         return 0;

esp/bindings/http/platform/httptransport.cpp

@@ -341,7 +341,7 @@ CHttpMessage::~CHttpMessage()
     }
     catch(...)
     {
-        ERRLOG("In CHttpMessage::~CHttpMessage() -- Unknown exception.");
+        IERRLOG("In CHttpMessage::~CHttpMessage() -- Unknown exception.");
     }
 };
 
@@ -784,11 +784,11 @@ void CHttpMessage::logMessage(MessageLogFlag messageLogFlag, const char *prefix)
     catch (IException *e)
     {
         StringBuffer msg;
-        ERRLOG("EXCEPTION %s when logging the message: %s", e->errorMessage(msg).str(), m_content.str());
+        IERRLOG("EXCEPTION %s when logging the message: %s", e->errorMessage(msg).str(), m_content.str());
         if (m_content_type.length() > 0)
-            ERRLOG("EXCEPTION %s when logging the message (m_content_type:%s):%s", e->errorMessage(msg).str(), m_content_type.get(), m_content.str());
+            IERRLOG("EXCEPTION %s when logging the message (m_content_type:%s):%s", e->errorMessage(msg).str(), m_content_type.get(), m_content.str());
         else
-            ERRLOG("EXCEPTION %s when logging the message: %s", e->errorMessage(msg).str(), m_content.str());
+            IERRLOG("EXCEPTION %s when logging the message: %s", e->errorMessage(msg).str(), m_content.str());
         e->Release();
     }
     return;
@@ -818,13 +818,13 @@ int CHttpMessage::send()
     catch (IException *e) 
     {
         StringBuffer estr;
-        DBGLOG("In CHttpMessage::send(%d) -- Exception(%d, %s) writing to socket(%d).", __LINE__, e->errorCode(), e->errorMessage(estr).str(), m_socket.OShandle());
+        IERRLOG("In CHttpMessage::send(%d) -- Exception(%d, %s) writing to socket(%d).", __LINE__, e->errorCode(), e->errorMessage(estr).str(), m_socket.OShandle());
         e->Release();
         return -1;
     }
     catch(...)
     {
-        ERRLOG("In CHttpMessage::send(%d) -- Unknown exception writing to socket(%d).", __LINE__, m_socket.OShandle());
+        IERRLOG("In CHttpMessage::send(%d) -- Unknown exception writing to socket(%d).", __LINE__, m_socket.OShandle());
         return -1;
     }
 
@@ -858,14 +858,14 @@ int CHttpMessage::send()
                 }
                 catch(...)
                 {
-                    ERRLOG("In CHttpMessage::send(%d) -- Unknown exception writing to socket(%d).", __LINE__, m_socket.OShandle());
+                    IERRLOG("In CHttpMessage::send(%d) -- Unknown exception writing to socket(%d).", __LINE__, m_socket.OShandle());
                     retcode = -1;
                     break;
                 }
             }
             else
             {
-                ERRLOG("Error read from file");
+                IERRLOG("Error read from file");
                 break;
             }
         }
@@ -890,13 +890,13 @@ int CHttpMessage::startSend()
     catch (IException *e) 
     {
         StringBuffer estr;
-        DBGLOG("In CHttpMessage::send() -- Exception(%d, %s) writing to socket(%d).", e->errorCode(), e->errorMessage(estr).str(), m_socket.OShandle());
+        IERRLOG("In CHttpMessage::send() -- Exception(%d, %s) writing to socket(%d).", e->errorCode(), e->errorMessage(estr).str(), m_socket.OShandle());
         e->Release();
         return -1;
     }
     catch(...)
     {
-        ERRLOG("In CHttpMessage::send() -- Unknown exception writing to socket(%d).", m_socket.OShandle());
+        IERRLOG("In CHttpMessage::send() -- Unknown exception writing to socket(%d).", m_socket.OShandle());
         return -1;
     }
 
@@ -915,13 +915,13 @@ int CHttpMessage::sendChunk(const char *chunk)
     catch (IException *e) 
     {
         StringBuffer estr;
-        DBGLOG("In CHttpMessage::send() -- Exception(%d, %s) writing to socket(%d).", e->errorCode(), e->errorMessage(estr).str(), m_socket.OShandle());
+        IERRLOG("In CHttpMessage::send() -- Exception(%d, %s) writing to socket(%d).", e->errorCode(), e->errorMessage(estr).str(), m_socket.OShandle());
         e->Release();
         return -1;
     }
     catch(...)
     {
-        ERRLOG("In CHttpMessage::send() -- Unknown exception writing to socket(%d).", m_socket.OShandle());
+        IERRLOG("In CHttpMessage::send() -- Unknown exception writing to socket(%d).", m_socket.OShandle());
         return -1;
     }
 
@@ -941,13 +941,13 @@ int CHttpMessage::sendFinalChunk(const char *chunk)
     catch (IException *e) 
     {
         StringBuffer estr;
-        DBGLOG("In CHttpMessage::send() -- Exception(%d, %s) writing to socket(%d).", e->errorCode(), e->errorMessage(estr).str(), m_socket.OShandle());
+        IERRLOG("In CHttpMessage::send() -- Exception(%d, %s) writing to socket(%d).", e->errorCode(), e->errorMessage(estr).str(), m_socket.OShandle());
         e->Release();
         return -1;
     }
     catch(...)
     {
-        ERRLOG("In CHttpMessage::send() -- Unknown exception writing to socket(%d).", m_socket.OShandle());
+        IERRLOG("In CHttpMessage::send() -- Unknown exception writing to socket(%d).", m_socket.OShandle());
         return -1;
     }
 
@@ -966,13 +966,13 @@ int CHttpMessage::close()
     catch (IException *e) 
     {
         StringBuffer estr;
-        ERRLOG("Exception(%d, %s) - CHttpMessage::close(), closing socket.", e->errorCode(), e->errorMessage(estr).str());
+        IERRLOG("Exception(%d, %s) - CHttpMessage::close(), closing socket.", e->errorCode(), e->errorMessage(estr).str());
         e->Release();
         ret = -1;
     }
     catch(...)
     {
-        ERRLOG("General Exception - CHttpMessage::close(), closing socket.");
+        IERRLOG("General Exception - CHttpMessage::close(), closing socket.");
         ret = -1;
     }
 
@@ -2026,7 +2026,7 @@ int CHttpRequest::readContentToFiles(StringBuffer netAddress, StringBuffer path,
         StringBuffer fileName;
         if (!readUploadFileName(multipart, fileName, fileContent, bytesNotRead))
         {
-            DBGLOG("No file name found for upload");
+            UERRLOG("No file name found for upload");
             break;
         }
 
@@ -2034,13 +2034,13 @@ int CHttpRequest::readContentToFiles(StringBuffer netAddress, StringBuffer path,
         Owned<IFile> file = createUploadFile(netAddress, path, fileName);
         if (!file)
         {
-            DBGLOG("Uploaded file %s cannot be created", fileName.str());
+            UERRLOG("Uploaded file %s cannot be created", fileName.str());
             break;
         }
         Owned<IFileIO> fileio = file->open(IFOcreate);
         if (!fileio)
         {
-            DBGLOG("Uploaded file %s cannot be opened", fileName.str());
+            UERRLOG("Uploaded file %s cannot be opened", fileName.str());
             break;
         }
 
@@ -2054,7 +2054,7 @@ int CHttpRequest::readContentToFiles(StringBuffer netAddress, StringBuffer path,
             {
                 if (fileio->write(writeOffset, fileContent.length(), fileContent.toByteArray()) != fileContent.length())
                 {
-                    DBGLOG("Failed to write Uploaded file %s", fileName.str());
+                    UERRLOG("Failed to write Uploaded file %s", fileName.str());
                     writeError = true;
                     break;
                 }
@@ -2494,7 +2494,7 @@ bool CHttpResponse::handleExceptions(IXslProcessor *xslp, IMultiException *me, c
     if (me->ordinality()>0)
     {
         StringBuffer msg;
-        WARNLOG("Exception(s) in %s::%s - %s", serv, meth, me->errorMessage(msg).append('\n').str());
+        IWARNLOG("Exception(s) in %s::%s - %s", serv, meth, me->errorMessage(msg).append('\n').str());
 
         StringBuffer content;
         switch (context->getResponseFormat())

esp/esdllib/esdl_def.cpp

@@ -2085,7 +2085,7 @@ void EsdlDefinition::addDefinitionsFromFile(const char *filename)
 void EsdlDefinition::addDefinitionFromXML(const StringBuffer & xmlDef, const char * esdlDefId)
 {
     if (!esdlDefId || !*esdlDefId)
-        DBGLOG("XML ESDL definition cannot be loaded with out definition ID.");
+        OWARNLOG("XML ESDL definition cannot be loaded with out definition ID.");
 
     if (!added.getValue(esdlDefId))
     {
@@ -2106,13 +2106,13 @@ void EsdlDefinition::addDefinitionFromXML(const StringBuffer & xmlDef, const cha
 {
     if (!esdlDefName || !*esdlDefName)
     {
-        DBGLOG("XML ESDL definition cannot be loaded with out definition name.");
+        OWARNLOG("XML ESDL definition cannot be loaded with out definition name.");
         return;
     }
 
     if (ver <= 0 )
     {
-        DBGLOG("XML ESDL definition cannot be loaded with out valid definition version.");
+        OWARNLOG("XML ESDL definition cannot be loaded with out valid definition version.");
         return;
     }
 

esp/esdllib/esdl_transformer2.cpp

@@ -1232,7 +1232,7 @@ void Esdl2Struct::addChildren(Esdl2Transformer *xformer, IEsdlDefObjectIterator
             else
             {
                 VStringBuffer msg("Can not find element: %s for %s as data_for target", dataFrom, self ? self->queryName() : "UNKNOWN");
-                ERRLOG("%s", msg.str());
+                IERRLOG("%s", msg.str());
                 throw MakeStringException(-1, "Internal Error: %s", msg.str());
             }
         }
@@ -1859,7 +1859,7 @@ void Esdl2Transformer::processHPCCResult(IEspContext &ctx, IEsdlDefMethod &mthde
                 xppToXmlString(*xpp, stag, logdata);
             else
             {
-                WARNLOG("ESDL processing HPCC Result: Dataset ignored: %s", dataset);
+                UWARNLOG("ESDL processing HPCC Result: Dataset ignored: %s", dataset);
                 xpp->skipSubTree();
             }
         }

esp/esplib/pqueue.hpp

@@ -157,7 +157,7 @@ public:
                 workers.push_back(new WorkerThread(*this));
                 workers.back()->start();
             }
-//            PrintLog("%d threads",workers.size());
+//            DBGLOG("%d threads",workers.size());
         }
     }
 

esp/logging/loggingagent/espserverloggingagent/loggingagent.cpp

@@ -187,7 +187,7 @@ int CESPServerLoggingAgent::getTransactionSeed(const char* appName, StringBuffer
         {
             StringBuffer errorStr;
             statusMessage.set("Failed to get TransactionSeed: error code ").append(e->errorCode()).append(", error message ").append(e->errorMessage(errorStr));
-            ERRLOG("%s -- try %d", statusMessage.str(), retry);
+            OERRLOG("%s -- try %d", statusMessage.str(), retry);
             e->Release();
             if (retry >= maxGTSRetries)
             {
@@ -320,7 +320,7 @@ bool CESPServerLoggingAgent::updateLog(IEspUpdateLogRequestWrap& req, IEspUpdate
     {//retry will be in update log queue.
         StringBuffer errorStr, errorMessage;
         errorMessage.append("Failed to update log: error code ").append(e->errorCode()).append(", error message ").append(e->errorMessage(errorStr));
-        ERRLOG("%s", errorMessage.str());
+        OERRLOG("%s", errorMessage.str());
         resp.setStatusCode(-1);
         resp.setStatusMessage(errorMessage.str());
         e->Release();

esp/logging/logginglib/LogSerializer.cpp

@@ -317,12 +317,12 @@ void CLogSerializer::loadSendLogs(GuidSet& ackSet, GuidMap& missedLogs, unsigned
     {
         StringBuffer errorStr;
         ex->errorMessage(errorStr);
-        ERRLOG("Exception caught within CSendLogSerializer::LoadDataMap: %s",errorStr.str());
+        IERRLOG("Exception caught within CSendLogSerializer::LoadDataMap: %s",errorStr.str());
         ex->Release();
     }
     catch(...)
     {
-        DBGLOG("Unknown Exception thrown in CSendLogSerializer::LoadDataMap");
+        IERRLOG("Unknown Exception thrown in CSendLogSerializer::LoadDataMap");
     }
     Close();
 }
@@ -368,7 +368,7 @@ void CLogSerializer::loadAckedLogs(GuidSet& ackedLogs)//
     {
         StringBuffer errorStr;
         ex->errorMessage(errorStr);
-        ERRLOG("Exception caught within CLogSerializer::loadAckedLogs: %s",errorStr.str());
+        IERRLOG("Exception caught within CLogSerializer::loadAckedLogs: %s",errorStr.str());
         ex->Release();
     }
     catch(...)
@@ -461,12 +461,12 @@ void CSendLogSerializer::LoadDataMap(GuidMap& ACKMap,StringArray& MissedLogs)
     {
         StringBuffer errorStr;
         ex->errorMessage(errorStr);
-        ERRLOG("Exception caught within CSendLogSerializer::LoadDataMap: %s",errorStr.str());
+        IERRLOG("Exception caught within CSendLogSerializer::LoadDataMap: %s",errorStr.str());
         ex->Release();
     }
     catch(...)
     {
-        DBGLOG("Unknown Exception thrown in CSendLogSerializer::LoadDataMap");
+        IERRLOG("Unknown Exception thrown in CSendLogSerializer::LoadDataMap");
     }
     Close();
 }
@@ -560,12 +560,12 @@ void CRecieveLogSerializer::LoadDataMap(GuidMap& GUIDmap)
     {
         StringBuffer errorStr;
         ex->errorMessage(errorStr);
-        ERRLOG("Exception caught within CRecieveLogSerializer::LoadDataMap: %s",errorStr.str());
+        IERRLOG("Exception caught within CRecieveLogSerializer::LoadDataMap: %s",errorStr.str());
         ex->Release();
     }
     catch(...)
     {
-        DBGLOG("Unknown Exception thrown in CRecieveLogSerializer::LoadDataMap");
+        IERRLOG("Unknown Exception thrown in CRecieveLogSerializer::LoadDataMap");
     }
     Close();
 }

esp/logging/logginglib/loggingagentbase.cpp

@@ -381,7 +381,7 @@ bool CDBLogAgentBase::getTransactionSeed(IEspGetTransactionSeedRequest& req, IEs
         {
             StringBuffer errorStr, errorMessage;
             errorMessage.append("Failed to get TransactionSeed: error code ").append(e->errorCode()).append(", error message ").append(e->errorMessage(errorStr));
-            ERRLOG("%s -- try %d", errorMessage.str(), retry);
+            OERRLOG("%s -- try %d", errorMessage.str(), retry);
             e->Release();
             if (retry < maxTriesGTS)
             {
@@ -447,7 +447,7 @@ bool CDBLogAgentBase::updateLog(IEspUpdateLogRequestWrap& req, IEspUpdateLogResp
     {
         StringBuffer errorStr, errorMessage;
         errorMessage.append("Failed to update log: error code ").append(e->errorCode()).append(", error message ").append(e->errorMessage(errorStr));
-        ERRLOG("%s", errorMessage.str());
+        OERRLOG("%s", errorMessage.str());
         e->Release();
         resp.setStatusCode(-1);
         resp.setStatusMessage(errorMessage.str());

esp/logging/logginglib/logthread.cpp

@@ -235,7 +235,7 @@ void CLogThread::sendLog()
                 {
                     logRequest->Release();
                 }
-                ERRLOG("%s", errorMessage.str());
+                IERRLOG("%s", errorMessage.str());
             }
         }
     }
@@ -243,12 +243,12 @@ void CLogThread::sendLog()
     {
         StringBuffer errorStr, errorMessage;
         errorMessage.append("Exception thrown within update log thread: error code ").append(e->errorCode()).append(", error message ").append(e->errorMessage(errorStr));
-        ERRLOG("%s", errorMessage.str());
+        IERRLOG("%s", errorMessage.str());
         e->Release();
     }
     catch(...)
     {
-        ERRLOG("Unknown exception thrown within update log thread");
+        IERRLOG("Unknown exception thrown within update log thread");
     }
 
     return;
@@ -375,12 +375,12 @@ void CLogThread::checkRollOver()
     {
         StringBuffer str;
         Ex->errorMessage(str);
-        ERRLOG("Exception thrown during tank file rollover: %s",str.str());
+        IERRLOG("Exception thrown during tank file rollover: %s",str.str());
         Ex->Release();
     }
     catch(...)
     {
-        ERRLOG("Unknown exception thrown during tank file rollover.");
+        IERRLOG("Unknown exception thrown during tank file rollover.");
     }
 }
 
@@ -420,10 +420,10 @@ void CLogThread::checkPendingLogs(bool bOneRecOnly)
 
             Owned<IEspUpdateLogRequestWrap> logRequest = unserializeLogRequestContent(logData.str());
             if (!logRequest)
-                ERRLOG("checkPendingLogs: failed to unserialize: %s", logData.str());
+                IERRLOG("checkPendingLogs: failed to unserialize: %s", logData.str());
             else if (!enqueue(logRequest, GUID))
             {
-                ERRLOG("checkPendingLogs: failed to add a log request to queue");
+                OERRLOG("checkPendingLogs: failed to add a log request to queue");
                 queueLogError=true;
             }
 
@@ -438,12 +438,12 @@ void CLogThread::checkPendingLogs(bool bOneRecOnly)
     {
         StringBuffer errorStr;
         ex->errorMessage(errorStr);
-        ERRLOG("CheckPendingLogs: %s:" ,errorStr.str());
+        IERRLOG("CheckPendingLogs: %s:" ,errorStr.str());
         ex->Release();
     }
     catch(...)
     {
-        ERRLOG("Unknown exception thrown in CheckPendingLogs");
+        IERRLOG("Unknown exception thrown in CheckPendingLogs");
     }
 }
 
@@ -478,10 +478,10 @@ void CLogThread::writeJobQueue(IEspUpdateLogRequestWrap* jobToWrite)
 
         int QueueSize = logQueue.ordinality();
         if(QueueSize > maxLogQueueLength)
-            ERRLOG("LOGGING QUEUE SIZE %d EXECEEDED MaxLogQueueLength %d, check the logging server.",QueueSize, maxLogQueueLength);
+            OERRLOG("LOGGING QUEUE SIZE %d EXCEEDED MaxLogQueueLength %d, check the logging server.",QueueSize, maxLogQueueLength);
 
         if(QueueSize!=0 && QueueSize % signalGrowingQueueAt == 0)
-            ERRLOG("Logging Queue at %d records. Check the logging server.",QueueSize);
+            OERRLOG("Logging Queue at %d records. Check the logging server.",QueueSize);
 
         logQueue.enqueue(LINK(jobToWrite));
     }

esp/logging/loggingmanager/loggingmanager.cpp

@@ -36,7 +36,7 @@ bool CLoggingManager::init(IPropertyTree* cfg, const char* service)
 {
     if (!cfg)
     {
-        ERRLOG(EspLoggingErrors::ConfigurationFileEntryError, "Logging Manager setting not found for %s", service);
+        OERRLOG(EspLoggingErrors::ConfigurationFileEntryError, "Logging Manager setting not found for %s", service);
         return false;
     }
 
@@ -60,7 +60,7 @@ bool CLoggingManager::init(IPropertyTree* cfg, const char* service)
         IEspLogAgent* loggingAgent = loadLoggingAgent(agentName, agentPlugin, service, cfg);
         if (!loggingAgent)
         {
-            ERRLOG(-1, "Failed to create logging agent for %s", agentName);
+            OERRLOG(-1, "Failed to create logging agent for %s", agentName);
             continue;
         }
         loggingAgent->init(agentName, agentType, &loggingAgentTree, service);
@@ -124,7 +124,7 @@ bool CLoggingManager::updateLog(IEspContext* espContext, const char* option, con
     {
         status.set("Failed to update log: ");
         e->errorMessage(status);
-        ERRLOG("%s", status.str());
+        OERRLOG("%s", status.str());
         e->Release();
     }
 
@@ -147,7 +147,7 @@ bool CLoggingManager::updateLog(IEspContext* espContext, const char* option, IPr
     {
         status.set("Failed to update log: ");
         e->errorMessage(status);
-        ERRLOG("%s", status.str());
+        OERRLOG("%s", status.str());
         e->Release();
     }
 
@@ -194,7 +194,7 @@ bool CLoggingManager::updateLog(IEspContext* espContext, const char* option, IPr
     {
         status.set("Failed to update log: ");
         e->errorMessage(status);
-        ERRLOG("%s", status.str());
+        OERRLOG("%s", status.str());
         e->Release();
     }
     return bRet;
@@ -271,7 +271,7 @@ bool CLoggingManager::updateLog(IEspContext* espContext, IEspUpdateLogRequestWra
     {
         StringBuffer errorStr;
         e->errorMessage(errorStr);
-        ERRLOG("Failed to update log: %s",errorStr.str());
+        OERRLOG("Failed to update log: %s",errorStr.str());
         resp.setStatusCode(-1);
         resp.setStatusMessage(errorStr.str());
         e->Release();
@@ -367,7 +367,7 @@ bool CLoggingManager::getTransactionSeed(StringBuffer& transactionSeed, StringBu
     {
         e->errorMessage(status);
         status.insert(0, "Failed to get Transaction Seed: ");
-        ERRLOG("%s",status.str());
+        OERRLOG("%s",status.str());
         e->Release();
     }
 
@@ -399,7 +399,7 @@ bool CLoggingManager::getTransactionSeed(IEspGetTransactionSeedRequest& req, IEs
     {
         StringBuffer errorStr;
         e->errorMessage(errorStr);
-        ERRLOG("Failed to get Transaction Seed: %s",errorStr.str());
+        OERRLOG("Failed to get Transaction Seed: %s",errorStr.str());
         resp.setStatusCode(-1);
         resp.setStatusMessage(errorStr.str());
         e->Release();

esp/platform/espbinding.hpp

@@ -76,7 +76,7 @@ public:
     {
         if (m_protocol)
             return dynamic_cast<ISocketSelectNotify*>(m_protocol);
-        DBGLOG("protocol is NULL");
+        IERRLOG("protocol is NULL");
         return NULL;
     }
 

esp/platform/espcache.cpp

@@ -187,7 +187,7 @@ bool ESPMemCached::checkServersUp()
     for (unsigned i = 0; i < numberOfServers-1; ++i)
     {
         if (!streq(stats[i].version, stats[i+1].version))
-            DBGLOG("ESPMemCached: Inhomogeneous versions of memcached across servers.");
+            OWARNLOG("ESPMemCached: Inhomogeneous versions of memcached across servers.");
     }
     return true;
 }

esp/platform/espcfg.cpp

@@ -156,12 +156,12 @@ int CSessionCleaner::run()
     catch(IException *e)
     {
         StringBuffer msg;
-        ERRLOG("CSessionCleaner::run() Exception %d:%s", e->errorCode(), e->errorMessage(msg).str());
+        IERRLOG("CSessionCleaner::run() Exception %d:%s", e->errorCode(), e->errorMessage(msg).str());
         e->Release();
     }
     catch(...)
     {
-        ERRLOG("Unknown CSessionCleaner::run() Exception");
+        IERRLOG("Unknown CSessionCleaner::run() Exception");
     }
     return 0;
 }
@@ -269,7 +269,7 @@ CEspConfig::CEspConfig(IProperties* inputs, IPropertyTree* envpt, IPropertyTree*
 
     if (!m_cfg->getProp("@name", m_process))
     {
-        ERRLOG("EspProcess name not found");
+        OERRLOG("EspProcess name not found");
     }
     else
     {
@@ -319,7 +319,7 @@ CEspConfig::CEspConfig(IProperties* inputs, IPropertyTree* envpt, IPropertyTree*
         }
 
         if (isDetachedFromDali())
-            WARNLOG("ESP Process [%s] loading in DALI DETACHED state - Some ESP services do not load in detached state!",  m_process.str());
+            OWARNLOG("ESP Process [%s] loading in DALI DETACHED state - Some ESP services do not load in detached state!",  m_process.str());
 
         StringBuffer daliservers;
         if (m_cfg->getProp("@daliServers", daliservers))
@@ -570,7 +570,7 @@ void CEspConfig::loadBinding(binding_cfg &xcfg)
 
     if(sit == m_services.end())
     {
-        DBGLOG("Warning: Service %s not found for binding %s", xcfg.service_name.str(), xcfg.name.str());
+        OWARNLOG("Warning: Service %s not found for binding %s", xcfg.service_name.str(), xcfg.name.str());
     }
     else
     {
@@ -610,9 +610,9 @@ void CEspConfig::loadBinding(binding_cfg &xcfg)
             {
                 IEspRpcBinding* bind = xproc(xcfg.name.str(), xcfg.type.str(), m_envpt.get(), m_process.str());
                 if (bind)
-                    DBGLOG("Load binding %s (type: %s, process: %s) succeeded", xcfg.name.str(), xcfg.type.str(), m_process.str());
+                    LOG(MCoperatorInfo, unknownJob,"Load binding %s (type: %s, process: %s) succeeded", xcfg.name.str(), xcfg.type.str(), m_process.str());
                 else
-                    ERRLOG("Failed to load binding %s (type: %s, process: %s)", xcfg.name.str(), xcfg.type.str(), m_process.str());
+                    OERRLOG("Failed to load binding %s (type: %s, process: %s)", xcfg.name.str(), xcfg.type.str(), m_process.str());
                 xcfg.bind.setown(bind);
                 if (serverstatus)
                 {
@@ -848,7 +848,7 @@ public:
             // If current path not found, use root
             char dir[_MAX_PATH];
             if (!GetCurrentDirectory(sizeof(dir), dir)) {
-                ERRLOG("ESPxsltIncludeHandler::getInclude: Current directory path too big, setting local path to null");
+                IERRLOG("ESPxsltIncludeHandler::getInclude: Current directory path too big, setting local path to null");
                 dir[0] = 0;
             }
 #ifdef _WIN32
@@ -890,7 +890,7 @@ void CEspConfig::bindServer(IEspServer &server, IEspContainer &container)
         {
             map<string, protocol_cfg*>::iterator pit = m_protocols.find(pbfg->protocol_name.str());
             if(pit == m_protocols.end())
-                DBGLOG("Protocol %s not found for binding %s", pbfg->protocol_name.str(), pbfg->name.str());
+                OWARNLOG("Protocol %s not found for binding %s", pbfg->protocol_name.str(), pbfg->name.str());
             else
             {
                 Owned<IXslProcessor> xslp=getXslProcessor();
@@ -912,7 +912,7 @@ void CEspConfig::bindServer(IEspServer &server, IEspContainer &container)
         }
         else
         {
-            ERRLOG("Binding %s wasn't loaded correctly", pbfg->name.str());
+            OERRLOG("Binding %s wasn't loaded correctly", pbfg->name.str());
         }
 
         bit++;

esp/platform/espcfg.ipp

@@ -208,7 +208,7 @@ public:
         }
         catch(...)
         {
-            DBGLOG("Lost Dali Connection");
+            OERRLOG("Lost Dali Connection");
         }
         return false;
     }
@@ -251,7 +251,7 @@ public:
         catch(IException* ie)
         {
             if (isDetachedFromDali())
-                ERRLOG("Could not load ESP service(s) while DETACHED from DALI - Consider re-attaching ESP process.");
+                UERRLOG("Could not load ESP service(s) while DETACHED from DALI - Consider re-attaching ESP process.");
             throw(ie);
         }
         loadProtocols();

esp/platform/espcontext.cpp

@@ -800,7 +800,7 @@ void checkRequest(IEspContext& ctx)
         {
             if(user->getStatus()!=SecUserStatus_Inhouse)
             {
-                ERRLOG("User %s trying to access unauthorized feature: internal", user->getName() ? user->getName() : ctx.queryUserId());
+                OWARNLOG("User %s trying to access unauthorized feature: internal", user->getName() ? user->getName() : ctx.queryUserId());
                 throw MakeStringException(400,"Bad request");
             }
         }

esp/platform/espp.cpp

@@ -171,7 +171,7 @@ int start_init_main(int argc, char** argv, int (*init_main_func)(int, char**))
             GetStartupInfo(&si); 
             if(!CreateProcess(NULL, (char*)command.str(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &process)) 
             { 
-                ERRLOG("Process failed: %d\r\n",GetLastError()); 
+                IERRLOG("Process failed: %d\r\n",GetLastError()); 
                 exit(-1); 
             } 
             WaitForSingleObject(process.hProcess,INFINITE); 
@@ -216,7 +216,7 @@ createworker:
    childpid = fork(); 
    if(childpid < 0) 
    { 
-      ERRLOG("Unable to create new process"); 
+      IERRLOG("Unable to create new process"); 
       result = -1; 
    } 
    else if(childpid == 0) 
@@ -436,13 +436,13 @@ int init_main(int argc, char* argv[])
     catch(IException* e)
     {
         StringBuffer description;
-        ERRLOG("ESP Unhandled IException (%d -- %s)", e->errorCode(), e->errorMessage(description).str());
+        IERRLOG("ESP Unhandled IException (%d -- %s)", e->errorCode(), e->errorMessage(description).str());
         e->Release();
         return -1;
     }
     catch (...)
     {
-        ERRLOG("ESP Unhandled General Exception.");
+        IERRLOG("ESP Unhandled General Exception.");
         return -1;
     }
 
@@ -466,13 +466,13 @@ int init_main(int argc, char* argv[])
         catch(IException* e)
         {
             StringBuffer description;
-            ERRLOG("ESP Unhandled IException (%d -- %s)", e->errorCode(), e->errorMessage(description).str());
+            IERRLOG("ESP Unhandled IException (%d -- %s)", e->errorCode(), e->errorMessage(description).str());
             e->Release();
             return -1;
         }
         catch (...)
         {
-            ERRLOG("ESP Unhandled General Exception.");
+            IERRLOG("ESP Unhandled General Exception.");
             return -1;
         }
 
@@ -482,7 +482,7 @@ int init_main(int argc, char* argv[])
     }
     else
     {
-        ERRLOG("!!! Unable to load ESP configuration.");
+        OERRLOG("!!! Unable to load ESP configuration.");
     }
     
     return result;

esp/platform/espp.hpp

@@ -114,7 +114,7 @@ public:
                     m_waitForExit.wait(1000); //if detached, should we wait longer?
                 else
                 {
-                    DBGLOG("Exiting ESP -- Lost DALI connection!");
+                    DISLOG("Exiting ESP -- Lost DALI connection!");
                     break;
                 }
             }

esp/platform/espplugin.cpp

@@ -106,11 +106,11 @@ int CEspServiceThread::run()
     catch (IException *e) 
    {
       StringBuffer estr;
-      ERRLOG("Exception(%d, %s) socket(%d).", e->errorCode(), e->errorMessage(estr).str(), m_socket->OShandle());
+      IERRLOG("Exception(%d, %s) socket(%d).", e->errorCode(), e->errorMessage(estr).str(), m_socket->OShandle());
       e->Release();
     }
 
-   ERRLOG("Closing Socket(%d)", m_socket->OShandle());
+   DBGLOG("Closing Socket(%d)", m_socket->OShandle());
 
    m_socket->shutdown();
    m_socket->close();

esp/platform/espplugin.ipp

@@ -51,7 +51,7 @@ public:
         SharedObject::load(m_plugin.str(), true);       // I'm not really sure what this should be - if global (as default) there will be clashes between multiple dloads
         if (!loaded())
         {
-            ERRLOG("Failed to load shared object (%s)", m_plugin.str());
+            OERRLOG("Failed to load shared object (%s)", m_plugin.str());
             return false;
         }
         return true;

esp/platform/espprotocol.cpp

@@ -51,12 +51,12 @@ CEspApplicationPort::CEspApplicationPort(bool viewcfg, CEspProtocol* prot) : bin
 
     hxsl = LoadSharedObject(SharedObjectPrefix "xmllib" SharedObjectExtension, true, false);
     if (!hxsl)
-        DBGLOG("Loading xmllib shared library failed!");
+        OWARNLOG("Loading xmllib shared library failed!");
     else
     {
         getXslProcessor_func xslfactory = (getXslProcessor_func) GetSharedProcedure(hxsl, "getXslProcessor");
         if (!xslfactory)
-            DBGLOG("Loading procedure from xmllib shared library failed!");
+            OWARNLOG("Loading procedure from xmllib shared library failed!");
         else
             xslp.setown(xslfactory());
     }
@@ -747,7 +747,7 @@ void CEspProtocol::initPersistentHandler(IPropertyTree * proc_cfg)
 
     if (maxIdleTime == 0 || maxReqs == 0)
     {
-        DBGLOG("Persistent connection won't be enabled because maxPersistentIdleTime or maxPersistentRequests is set to 0");
+        OWARNLOG("Persistent connection won't be enabled because maxPersistentIdleTime or maxPersistentRequests is set to 0");
         return;
     }
     m_persistentHandler.setown(createPersistentHandler(this, maxIdleTime, maxReqs, static_cast<PersistentLogLevel>(getEspLogLevel())));

esp/platform/espthread.cpp

@@ -183,12 +183,12 @@ int CEspProtocolThread::run()
     catch (IException *e) 
     {
         StringBuffer estr;
-        ERRLOG("Exception(%d, %s) in CEspProtocolThread::run while processing request.", e->errorCode(), e->errorMessage(estr).str());
+        IERRLOG("Exception(%d, %s) in CEspProtocolThread::run while processing request.", e->errorCode(), e->errorMessage(estr).str());
         e->Release();
     }
     catch(...)
     {
-        ERRLOG("Unknown Exception in CEspProtocolThread::run while processing request.");
+        IERRLOG("Unknown Exception in CEspProtocolThread::run while processing request.");
     }
 
     if(!keepAlive)

esp/platform/sechandler.cpp

@@ -272,12 +272,12 @@ bool SecHandler::authorizeSecReqFeatures(StringArray & features, IEspStringIntMa
     {
         StringBuffer errmsg;
         e->errorMessage(errmsg);
-        ERRLOG("Exception authorizing, error=%s\n", errmsg.str());
+        IERRLOG("Exception authorizing, error=%s\n", errmsg.str());
         return false;
     }
     catch(...)
     {
-        ERRLOG("Unknown exception authorizing\n");
+        IERRLOG("Unknown exception authorizing\n");
         return false;
     }
     if(auth_ok)

esp/platform/tokenserialization.hpp

@@ -433,7 +433,7 @@ private:
         if (success)
             DBGLOG("Result of deserializing '%s' to type '%s': %s", buffer, typeStr, resultStr);
         else
-            ERRLOG("Result of deserializing '%s' to type '%s': %s", buffer, typeStr, resultStr);
+            OERRLOG("Result of deserializing '%s' to type '%s': %s", buffer, typeStr, resultStr);
     }
     bool isEmptyOrWhitespace(const char* buffer) const
     {

esp/services/esdl_svc_engine/esdl_binding.cpp

@@ -217,7 +217,7 @@ void EsdlServiceImpl::configureJavaMethod(const char *method, IPropertyTree &ent
     const char *javaScopedMethod = entry.queryProp("@javamethod");
     if (!javaScopedMethod || !*javaScopedMethod)
     {
-        DBGLOG("ESDL binding - found java target method \"%s\" without java method defined.", method);
+        UWARNLOG("ESDL binding - found java target method \"%s\" without java method defined.", method);
         return;
     }
 
@@ -225,7 +225,7 @@ void EsdlServiceImpl::configureJavaMethod(const char *method, IPropertyTree &ent
     javaNodes.appendList(javaScopedMethod, ".");
     if (javaNodes.length()!=3) //adf: may become more flexible?
     {
-        DBGLOG("ESDL binding - target method \"%s\", configured java method currently must be of the form 'package.class.method', found (%s).", method, javaScopedMethod);
+        UWARNLOG("ESDL binding - target method \"%s\", configured java method currently must be of the form 'package.class.method', found (%s).", method, javaScopedMethod);
         return;
     }
 
@@ -247,7 +247,7 @@ void EsdlServiceImpl::configureJavaMethod(const char *method, IPropertyTree &ent
             else
             {
                 //Log error, but try again next reload, in case the java class is fixed
-                DBGLOG("ESDL binding - failed to load java class %s for target method %s", javaScopedClass.str(), method);
+                UWARNLOG("ESDL binding - failed to load java class %s for target method %s", javaScopedClass.str(), method);
             }
         }
         catch (IException *E)
@@ -304,13 +304,13 @@ void EsdlServiceImpl::configureUrlMethod(const char *method, IPropertyTree &entr
     const char *url = entry.queryProp("@url");
     if (!url || !*url)
     {
-        DBGLOG("ESDL binding - found target method \"%s\" without target url!", method);
+        UWARNLOG("ESDL binding - found target method \"%s\" without target url!", method);
         return;
     }
 
     if (!entry.hasProp("@queryname"))
     {
-        DBGLOG("ESDL binding - found target method \"%s\" without target query!", method);
+        UWARNLOG("ESDL binding - found target method \"%s\" without target query!", method);
         return;
     }
 
@@ -355,13 +355,13 @@ void EsdlServiceImpl::addServiceLevelRequestTransform(IPropertyTree *customReque
         m_serviceLevelCrtFail = true;
         StringBuffer msg;
         e->errorMessage(msg);
-        ERRLOG("Service Level Custom Request Transform could not be processed!!: \n\t%s", msg.str());
+        IERRLOG("Service Level Custom Request Transform could not be processed!!: \n\t%s", msg.str());
         e->Release();
     }
     catch (...)
     {
         m_serviceLevelCrtFail = true;
-        ERRLOG("Service Level Custom Request Transform could not be processed!!");
+        IERRLOG("Service Level Custom Request Transform could not be processed!!");
     }
 }
 
@@ -382,14 +382,14 @@ void EsdlServiceImpl::addMethodLevelRequestTransform(const char *method, IProper
         VStringBuffer errmsg("Custom Request Transform for method %s could not be processed!!: %s", method, msg.str());
 
         m_methodCRTransformErrors.setValue(method, errmsg.str());
-        ERRLOG("%s", errmsg.str());
+        IERRLOG("%s", errmsg.str());
         e->Release();
     }
     catch (...)
     {
         VStringBuffer errmsg("Custom Request Transform for method %s could not be processed!!", method);
         m_methodCRTransformErrors.setValue(method, errmsg.str());
-        ERRLOG("%s", errmsg.str());
+        IERRLOG("%s", errmsg.str());
     }
 }
 
@@ -434,7 +434,7 @@ void EsdlServiceImpl::configureTargets(IPropertyTree *cfg, const char *service)
             VStringBuffer errmsg("Encountered error while fetching \"xsdl:CustomRequestTransform\" from service \"%s\" ESDL configuration: %s ", service, msg.str());
 
             m_serviceLevelCrtFail = true;
-            ERRLOG("%s", errmsg.str());
+            OERRLOG("%s", errmsg.str());
             e->Release();
         }
 
@@ -482,7 +482,7 @@ void EsdlServiceImpl::configureTargets(IPropertyTree *cfg, const char *service)
                 VStringBuffer errmsg("Encountered error while fetching 'xsdl:CustomRequestTransform' from service '%s', method '%s' ESDL configuration: %s ", service, method, msg.str());
 
                 m_methodCRTransformErrors.setValue(method, errmsg.str());
-                ERRLOG("%s", errmsg.str());
+                OERRLOG("%s", errmsg.str());
                 e->Release();
             }
 
@@ -1101,11 +1101,11 @@ void EsdlServiceImpl::handleFinalRequest(IEspContext &context,
         }
         catch (XmlPullParserException& xppe)
         {
-            ERRLOG("Unable to echo transformed request to response: %s", xppe.what());
+            IERRLOG("Unable to echo transformed request to response: %s", xppe.what());
         }
         catch (...)
         {
-            ERRLOG("Unable to echo transformed request to response");
+            IERRLOG("Unable to echo transformed request to response");
         }
     }
 
@@ -1242,12 +1242,12 @@ void EsdlServiceImpl::sendTargetSOAP(IEspContext & context,
 
     if (status.length()==0)
     {
-        ERRLOG("EsdlBindingImpl::sendTargetSOAP sendRequest() status not reported, response content: %s", resp.str());
+        UERRLOG("EsdlBindingImpl::sendTargetSOAP sendRequest() status not reported, response content: %s", resp.str());
         throw makeWsException( ERR_ESDL_BINDING_UNAVAIL, WSERR_CLIENT, "ESP", "Internal Server Unavailable");
     }
     else if (strncmp("500", status.str(), 3)==0)  //process internal service errors.
     {
-        ERRLOG("EsdlBindingImpl::sendTargetSOAP sendRequest() status: %s", status.str());
+        UERRLOG("EsdlBindingImpl::sendTargetSOAP sendRequest() status: %s", status.str());
         StringBuffer out;
         getSoapError(out,resp,":Text", ":Text>");
 
@@ -1265,7 +1265,7 @@ void EsdlServiceImpl::sendTargetSOAP(IEspContext & context,
     }
     else if (strncmp("200", status.str(), 3)!=0)
     {
-        ERRLOG("EsdlBindingImpl::sendTargetSOAP sendRequest() status: %s", status.str());
+        UERRLOG("EsdlBindingImpl::sendTargetSOAP sendRequest() status: %s", status.str());
         throw makeWsException( 3402, WSERR_SERVER, "ESP", "SoapCallStatus:%s", status.str());
     }
 
@@ -1521,7 +1521,7 @@ bool EsdlBindingImpl::reloadDefinitionsFromCentralStore(IPropertyTree * esdlBndC
 
         if (!loadDefinitions(m_espServiceName.get(), tempESDLDef, esdlBndCng, loadedname, m_esdlStateFilesLocation.str()))
         {
-            DBGLOG("Failed to reload ESDL definitions");
+            OERRLOG("Failed to reload ESDL definitions");
             return false;
         }
 
@@ -1534,7 +1534,7 @@ bool EsdlBindingImpl::reloadDefinitionsFromCentralStore(IPropertyTree * esdlBndC
         return true;
     }
 
-    DBGLOG("Cannot reload definitions because the service implementation is not available");
+    OERRLOG("Cannot reload definitions because the service implementation is not available");
     return false;
 }
 
@@ -1581,14 +1581,14 @@ bool EsdlBindingImpl::reloadBindingFromCentralStore(const char* bindingId)
     }
     catch(IException* e)
     {
-       StringBuffer msg;
-       e->errorMessage(msg);
-       DBGLOG("Exception caught in EsdlBindingImpl::EsdlBindingImpl: %s", msg.str());
-       e->Release();
+        StringBuffer msg;
+        e->errorMessage(msg);
+        IERRLOG("Exception caught in EsdlBindingImpl::EsdlBindingImpl: %s", msg.str());
+        e->Release();
     }
     catch (...)
     {
-        DBGLOG("Exception caught in EsdlBindingImpl::EsdlBindingImpl: Could Not load Binding %s information from Dali!", bindingId);
+        IERRLOG("Exception caught in EsdlBindingImpl::EsdlBindingImpl: Could Not load Binding %s information from Dali!", bindingId);
     }
     return true;
 }

esp/services/esdl_svc_engine/esdl_monitor.cpp

@@ -250,7 +250,7 @@ public:
             {
                 StringBuffer msg;
                 e->errorMessage(msg);
-                ERRLOG("Exception while loading dynamic binding %s: %d - %s", data->id.str(), e->errorCode(), msg.str());
+                IERRLOG("Exception while loading dynamic binding %s: %d - %s", data->id.str(), e->errorCode(), msg.str());
                 e->Release();
             }
         }
@@ -299,7 +299,7 @@ public:
                 removeBindingFromMap(data->id.str());
             }
             else
-                DBGLOG("Can't delete binding %s, it's not currently registered", data->id.str());
+                OWARNLOG("Can't delete binding %s, it's not currently registered", data->id.str());
         }
         else if (ntype == EsdlNotifyType::BindingUpdate)
         {
@@ -307,7 +307,7 @@ public:
             EsdlBindingImpl* theBinding = findBinding(data->id.str());
             if (!theBinding)
             {
-                DBGLOG("Binding %s not found, can't update", data->id.str());
+                OWARNLOG("Binding %s not found, can't update", data->id.str());
                 return;
             }
             DBGLOG("Reloading ESDL binding %s", data->id.str());
@@ -317,7 +317,7 @@ public:
         {
             if (!espProcessMatch(data->espProcess.str()))
             {
-                DBGLOG("ESDL binding %s is not for this esp process, ignore.", data->id.str());
+                OWARNLOG("ESDL binding %s is not for this esp process, ignore.", data->id.str());
                 return;
             }
 
@@ -334,14 +334,14 @@ public:
                 data->name.set(data->id);
             if (data->port == 0)
             {
-                DBGLOG("Port is not provided for binding, can't create binding.");
+                OWARNLOG("Port is not provided for binding, can't create binding.");
                 return;
             }
             addBinding(data);
         }
         else
         {
-            WARNLOG("Unexpected notify type received, ignore.");  //DefintionAdd and DefinitionDelete shouldn't happen
+            IWARNLOG("Unexpected notify type received, ignore.");  //DefintionAdd and DefinitionDelete shouldn't happen
         }
     }
 

esp/services/esdl_svc_engine/esdl_store.cpp

@@ -687,7 +687,7 @@ public:
                 if (!bindingcfg)
                 {
                     message.setf("Could not configure service '%s' because there's no template esp binding configured on port %s or port 0 for esp process '%s'", esdlServiceName, espPort, espProcName);
-                    DBGLOG("%s", message.str());
+                    OWARNLOG("%s", message.str());
                     return -1;
                 }
             }
@@ -1116,12 +1116,12 @@ public:
     {
         if (!mListener)
         {
-            DBGLOG("Can't handle subscription notification because the listener is NULL");
+            OWARNLOG("Can't handle subscription notification because the listener is NULL");
             return;
         }
         if (id != sub_id)
         {
-            DBGLOG("Dali subscription (%" I64F "d) received notification for unrecognized dali subscription id: (%" I64F "d)", (__int64) sub_id, (__int64) id);
+            OWARNLOG("Dali subscription (%" I64F "d) received notification for unrecognized dali subscription id: (%" I64F "d)", (__int64) sub_id, (__int64) id);
             return;
         }
 
@@ -1176,7 +1176,7 @@ public:
             }
             catch (IException *E)
             {
-                DBGLOG("ESDL failed to subscribe to DALI (%s)", ESDL_CHANGE_PATH);
+                OWARNLOG("ESDL failed to subscribe to DALI (%s)", ESDL_CHANGE_PATH);
                 E->Release();
             }
         }

esp/services/esdl_svc_engine/esdl_svc_custom.cpp

@@ -46,7 +46,7 @@ CEsdlCustomTransformChoose::CEsdlCustomTransformChoose(IPropertyTree * choosewhe
             }
         }
         else
-            ERRLOG("CEsdlCustomTransformChoose: Found xsdl:choose clause without required xsdl:when");
+            IERRLOG("CEsdlCustomTransformChoose: Found xsdl:choose clause without required xsdl:when");
     }
 }
 
@@ -96,7 +96,7 @@ void CEsdlCustomTransformChoose::processClauses(IPropertyTree *request, IXpathCo
                         if (!optional)
                             throw MakeStringException(-1, "%s", msg.str());
                         else
-                            ERRLOG("%s", msg.str());
+                            OERRLOG("%s", msg.str());
                     }
                 }
                 else
@@ -168,7 +168,7 @@ void CEsdlCustomTransformChoose::compileClauses(IPropertyTreeIterator * rulesite
             if(!optional)
                 throw MakeStringException(-1, "%s", msg.str());
             else
-                ERRLOG("%s", msg.str());
+                IERRLOG("%s", msg.str());
                 continue;
         }
 
@@ -179,7 +179,7 @@ void CEsdlCustomTransformChoose::compileClauses(IPropertyTreeIterator * rulesite
             if(!optional)
                 throw MakeStringException(-1, "%s", msg.str());
             else
-                ERRLOG("%s", msg.str());
+                IERRLOG("%s", msg.str());
                 continue;
         }
 
@@ -266,7 +266,7 @@ void CEsdlCustomTransformChoose::process(IEspContext * context, IPropertyTree *r
     }
     catch (...)
     {
-        ERRLOG("EsdlCustomTransformClause::process internal error");
+        IERRLOG("EsdlCustomTransformClause::process internal error");
     }
 }
 
@@ -330,7 +330,7 @@ void processServiceAndMethodTransforms(std::initializer_list<IEsdlCustomTransfor
 
         VStringBuffer ver("%g", context->getClientVersion());
         if(!xpathContext->addVariable("clientversion", ver.str()))
-            ERRLOG("Could not set custom transform variable: clientversion:'%s'", ver.str());
+            OERRLOG("Could not set custom transform variable: clientversion:'%s'", ver.str());
         //in case transform wants to make use of these values:
         xpathContext->addVariable("query", tgtcfg->queryProp("@queryname"));
         xpathContext->addVariable("method", mthdef.queryMethodName());

esp/services/ws_access/ws_accessService.cpp

@@ -70,7 +70,7 @@ void Cws_accessEx::init(IPropertyTree *cfg, const char *process, const char *ser
     IPropertyTree* servicecfg = cfg->getPropTree(xpath.str());
     if(servicecfg == NULL)
     {
-        WARNLOG(-1, "config not found for service %s/%s",process, service);
+        OWARNLOG("Config not found for service %s/%s",process, service);
         return;
     }
     m_servicecfg.setown(servicecfg);
@@ -699,7 +699,7 @@ bool Cws_accessEx::onUserGroupEdit(IEspContext &context, IEspUserGroupEditReques
         {
             StringBuffer errmsg;
             e->errorMessage(errmsg);
-            DBGLOG("error changing user's group membership: %s", errmsg.str());
+            OERRLOG("error changing user's group membership: %s", errmsg.str());
             resp.setRetcode(e->errorCode());
             resp.setRetmsg(errmsg.str());
             return false;
@@ -1540,7 +1540,7 @@ bool Cws_accessEx::onGroupMemberEdit(IEspContext &context, IEspGroupMemberEditRe
         {
             StringBuffer errmsg;
             e->errorMessage(errmsg);
-            DBGLOG("error changing user's group membership: %s", errmsg.str());
+            OERRLOG("error changing user's group membership: %s", errmsg.str());
             resp.setRetcode(e->errorCode());
             resp.setRetmsg(errmsg.str());
             return false;
@@ -2854,7 +2854,7 @@ int Cws_accessEx::enableDisableScopeScans(IEspContext &context, bool doEnable, S
     int retCode;
     bool rc = querySessionManager().enableScopeScans(userdesc, doEnable, &retCode, retMsg);
     if (!rc || retCode != 0)
-        DBGLOG("Error %d enabling Scope Scans : %s", retCode, retMsg.str());
+        IERRLOG("Error %d enabling Scope Scans : %s", retCode, retMsg.str());
     return retCode;
 }
 

esp/services/ws_dfu/ws_dfuService.cpp

@@ -2396,12 +2396,12 @@ void CWsDfuEx::doGetFileDetails(IEspContext &context, IUserDescriptor *udesc, co
                 catch(IException *e)
                 {
                     StringBuffer msg;
-                    ERRLOG("Exception %d:%s in WS_DFU queryDistributedFileSystem().getSize()", e->errorCode(), e->errorMessage(msg).str());
+                    IERRLOG("Exception %d:%s in WS_DFU queryDistributedFileSystem().getSize()", e->errorCode(), e->errorMessage(msg).str());
                     e->Release();
                 }
                 catch(...)
                 {
-                    ERRLOG("Unknown exception in WS_DFU queryDistributedFileSystem().getSize()");
+                    IERRLOG("Unknown exception in WS_DFU queryDistributedFileSystem().getSize()");
                 }
 
                 PartList.append(*FilePart.getClear());
@@ -2456,7 +2456,7 @@ void CWsDfuEx::doGetFileDetails(IEspContext &context, IUserDescriptor *udesc, co
             }
             catch(...)
             {
-                DBGLOG("Failed in retrieving graphs from workunit %s", wuid);
+                IERRLOG("Failed in retrieving graphs from workunit %s", wuid);
             }
         }
     }
@@ -5749,12 +5749,12 @@ int CWsDfuEx::GetIndexData(IEspContext &context, bool bSchemaOnly, const char* i
     }
     catch (IException *e)
     {
-        DBGLOG(e);
+        IERRLOG(e);
         e->Release();
     }
     catch(...)
     {
-        DBGLOG("Unknown Exception - view data file: %s", indexName);
+        IERRLOG("Unknown Exception - view data file: %s", indexName);
     }
 
     Owned<IResultSetFactory> resultSetFactory = getSecResultSetFactory(context.querySecManager(), context.queryUser(), context.queryUserId(), context.queryPassword());

esp/services/ws_dfu/ws_dfuXRefService.cpp

@@ -93,7 +93,7 @@ void CWsDfuXRefEx::init(IPropertyTree *cfg, const char *process, const char *ser
 
     if (!daliClientActive())
     {
-        ERRLOG("No Dali Connection Active.");
+        OERRLOG("No Dali Connection Active.");
         throw MakeStringException(-1, "No Dali Connection Active. Please Specify a Dali to connect to in you configuration file");
     }
     XRefNodeManager.setown(CreateXRefNodeFactory());    
@@ -119,14 +119,14 @@ bool CWsDfuXRefEx::onDFUXRefArrayAction(IEspContext &context, IEspDFUXRefArrayAc
 
         if(*req.getAction() == 0 || *req.getType() == 0 || *req.getCluster() == 0)
         {
-            ERRLOG("Invalid Parameters into CWsDfuXRefEx::onDFUXRefArrayAction");
+            IERRLOG("Action, Type and Cluster must be specified in the DFUXRefArrayAction ");
             throw MakeStringExceptionDirect(ECLWATCH_INVALID_INPUT, "Action, cluster, or type not defined.");
         }
         
         Owned<IXRefNode> xRefNode = XRefNodeManager->getXRefNode(req.getCluster());
         if (xRefNode.get() == 0)
         {
-            ERRLOG("Unable to resolve XRef cluster name %s",req.getCluster());
+            IERRLOG("Unable to resolve XRef cluster name %s",req.getCluster());
             throw MakeStringException(ECLWATCH_CANNOT_RESOLVE_CLUSTER_NAME, "Unable to resolve cluster name %s",req.getCluster());
         }
 
@@ -134,7 +134,7 @@ bool CWsDfuXRefEx::onDFUXRefArrayAction(IEspContext &context, IEspDFUXRefArrayAc
         Owned<IXRefFilesNode> _fileNode = getFileNodeInterface(*xRefNode.get(),req.getType());
         if (_fileNode.get() == 0)
         {
-            ERRLOG("Unable to find a suitable IXRefFilesNode interface for %s",req.getType());
+            IERRLOG("Unable to find a suitable IXRefFilesNode interface for %s",req.getType());
             throw MakeStringException(ECLWATCH_CANNOT_FIND_IXREFFILESNODE, "Unable to find a suitable IXRefFilesNode interface for %s",req.getType());
         }
 
@@ -190,7 +190,7 @@ IXRefFilesNode* CWsDfuXRefEx::getFileNodeInterface(IXRefNode& XRefNode,const cha
     else if (strcmp("Orphan" ,nodeType) == 0)
         return XRefNode.getOrphanFiles();
     else
-        WARNLOG("Unrecognized file node type %s",nodeType);
+        OWARNLOG("Unrecognized file node type %s",nodeType);
     return 0;
 }
 

esp/services/ws_dfu/ws_dfuXRefService.hpp

@@ -117,12 +117,12 @@ public:
         {
             StringBuffer errorStr;
             e->errorMessage(errorStr);
-            ERRLOG("Exception thrown while running XREF: %s", errorStr.str());
+            IERRLOG("Exception thrown while running XREF: %s", errorStr.str());
             e->Release();
         }
         catch(...)
         {
-            ERRLOG("Unknown Exception thrown from XREF");
+            IERRLOG("Unknown Exception thrown from XREF");
         }
     }
 

esp/services/ws_ecl/ws_ecl_service.cpp

@@ -1932,7 +1932,7 @@ int CWsEclBinding::submitWsEclWorkunit(IEspContext & context, WsEclWuInfo &wsinf
         Owned<IWuWebView> web = createWuWebView(wuid.str(), wsinfo.qsetname.get(), wsinfo.queryname.get(), getCFD(), true, queryXsltConfig());
         if (!web)
         {
-            DBGLOG("WS-ECL failed to create WuWebView for workunit %s", wuid.str());
+            IERRLOG("WS-ECL failed to create WuWebView for workunit %s", wuid.str());
             return 0;
         }
         if (viewname)

esp/services/ws_fs/ws_fsBinding.cpp

@@ -510,7 +510,7 @@ int CFileSpraySoapBindingEx::onFinishUpload(IEspContext &ctx, CHttpRequest* requ
     else
     {
         StringBuffer msg;
-        WARNLOG("Exception(s) in EspHttpBinding::onStartUpload - %s", me->errorMessage(msg).append('\n').str());
+        IWARNLOG("Exception(s) in EspHttpBinding::onStartUpload - %s", me->errorMessage(msg).append('\n').str());
         if ((ctx.getResponseFormat() == ESPSerializationXML) || (ctx.getResponseFormat() == ESPSerializationJSON))
             response->handleExceptions(NULL, me, "FileSpray", "UploadFile", NULL, false);
         else

esp/services/ws_fs/ws_fsService.cpp

@@ -86,7 +86,7 @@ int Schedule::run()
                     catch(IException *e)
                     {
                         StringBuffer msg;
-                        ERRLOG("Exception %d:%s in WsWorkunits Schedule::run", e->errorCode(), e->errorMessage(msg).str());
+                        IERRLOG("Exception %d:%s in WsWorkunits Schedule::run", e->errorCode(), e->errorMessage(msg).str());
                         e->Release();
                     }
                     itr->next();
@@ -95,17 +95,17 @@ int Schedule::run()
             catch(IException *e)
             {
                 StringBuffer msg;
-                ERRLOG("Exception %d:%s in WS_FS Schedule::run", e->errorCode(), e->errorMessage(msg).str());
+                IERRLOG("Exception %d:%s in WS_FS Schedule::run", e->errorCode(), e->errorMessage(msg).str());
                 e->Release();
             }
             catch(...)
             {
-                ERRLOG("Unknown exception in WS_FS Schedule::run");
+                IERRLOG("Unknown exception in WS_FS Schedule::run");
             }
         }
         else
         {
-            WARNLOG("Detached from DALI, WS_FS schedule interrupted");
+            OWARNLOG("Detached from DALI, WS_FS schedule interrupted");
             waitTimeMillies = (unsigned)-1;
         }
         semSchedule.wait(waitTimeMillies);
@@ -156,15 +156,15 @@ void CFileSprayEx::init(IPropertyTree *cfg, const char *process, const char *ser
 
     StringBuffer prop;
     prop.appendf("queueLabel=%s", m_QueueLabel.str());
-    PrintLog(prop.str());
+    DBGLOG("%s", prop.str());
     prop.clear();
     prop.appendf("monitorQueueLabel=%s", m_MonitorQueueLabel.str());
-    PrintLog(prop.str());
+    DBGLOG("%s", prop.str());
 
     if (!daliClientActive())
     {
-        ERRLOG("No Dali Connection Active.");
-        throw MakeStringException(-1, "No Dali Connection Active. Please Specify a Dali to connect to in you configuration file");
+        OERRLOG("No Dali Connection Active.");
+        throw MakeStringException(-1, "No Dali Connection Active. Please Specify a Dali to connect to in your configuration file");
     }
 
     m_sched.start();

esp/services/ws_loggingservice/loggingservice.cpp

@@ -48,7 +48,7 @@ bool CWsLoggingServiceEx::init(const char* service, const char* type, IPropertyT
         IEspLogAgent* logAgent = loadLoggingAgent(agentName, agentPlugin);
         if (!logAgent)
         {
-            ERRLOG(-1, "Failed to create logging agent for %s", agentName);
+            OERRLOG(-1, "Failed to create logging agent for %s", agentName);
             continue;
         }
         logAgent->init(agentName, agentType, &ptree, process);
@@ -100,7 +100,7 @@ bool CWsLoggingServiceEx::onUpdateLog(IEspContext& context, IEspUpdateLogRequest
     {
         StringBuffer errorStr;
         e->errorMessage(errorStr);
-        ERRLOG("Failed to update log: cannot add to log queue: %s",errorStr.str());
+        OERRLOG("Failed to update log: cannot add to log queue: %s",errorStr.str());
         resp.setStatusCode(-1);
         resp.setStatusMessage(errorStr.str());
         e->Release();
@@ -132,7 +132,7 @@ bool CWsLoggingServiceEx::onGetTransactionSeed(IEspContext& context, IEspGetTran
         StringBuffer errorStr;
         e->errorMessage(errorStr);
         errorStr.insert(0, "Failed to get Transaction Seed: ");
-        ERRLOG("%s", errorStr.str());
+        OERRLOG("%s", errorStr.str());
         resp.setStatusCode(-1);
         resp.setStatusMessage(errorStr.str());
         e->Release();

esp/services/ws_machine/ws_machineService.cpp

@@ -714,7 +714,7 @@ void Cws_machineEx::getThorProcesses(IConstEnvironment* constEnv, IPropertyTree*
         gi->query().endpoint().getIpText(addressRead);
         if (addressRead.length() == 0)
         {
-            WARNLOG("Network address not found for a node in node group %s", groupName.str());
+            OWARNLOG("Network address not found for a node in node group %s", groupName.str());
             continue;
         }
 
@@ -734,14 +734,14 @@ void Cws_machineEx::getThorProcesses(IConstEnvironment* constEnv, IPropertyTree*
 
         if (netAddress.length() == 0)
         {
-            WARNLOG("Network address not found for a node in node group %s", groupName.str());
+            OWARNLOG("Network address not found for a node in node group %s", groupName.str());
             continue;
         }
 
         Owned<IConstMachineInfo> pMachineInfo =  constEnv->getMachineByAddress(addressRead.str());
         if (!pMachineInfo.get())
         {
-            WARNLOG("Machine not found at network address %s", addressRead.str());
+            OWARNLOG("Machine not found at network address %s", addressRead.str());
             continue;
         }
 
@@ -800,7 +800,7 @@ void Cws_machineEx::getProcesses(IConstEnvironment* constEnv, IPropertyTree* env
             Owned<IConstMachineInfo> pMachineInfo =  constEnv->getMachine(name0);
             if (!pMachineInfo.get())
             {
-                WARNLOG("Machine %s not found in environment setting", name0);
+                OWARNLOG("Machine %s not found in environment setting", name0);
                 continue;
             }
 
@@ -810,7 +810,7 @@ void Cws_machineEx::getProcesses(IConstEnvironment* constEnv, IPropertyTree* env
             const char* ip = ep.str();
             if (!ip)
             {
-                WARNLOG("Network address not found for machine %s", name0);
+                OWARNLOG("Network address not found for machine %s", name0);
                 continue;
             }
 

esp/services/ws_packageprocess/ws_packageprocessService.cpp

@@ -1397,7 +1397,7 @@ int CWsPackageProcessSoapBindingEx::onFinishUpload(IEspContext &ctx, CHttpReques
     if (meIn && (meIn->ordinality() > 0))
     {
         StringBuffer msg;
-        WARNLOG("Exception(s) in EspHttpBinding::onFinishUpload - %s", meIn->errorMessage(msg).append('\n').str());
+        IWARNLOG("Exception(s) in EspHttpBinding::onFinishUpload - %s", meIn->errorMessage(msg).append('\n').str());
         if ((ctx.getResponseFormat() == ESPSerializationXML) || (ctx.getResponseFormat() == ESPSerializationJSON))
         {
             response->handleExceptions(NULL, meIn, "FileSpray", "UploadFile", NULL, false);
@@ -1411,7 +1411,7 @@ int CWsPackageProcessSoapBindingEx::onFinishUpload(IEspContext &ctx, CHttpReques
     Owned<IEspWsPackageProcess> iserv = (IEspWsPackageProcess*)getService();
     if(iserv == NULL)
     {
-        WARNLOG("Exception(s) in %s::%s - Service not available", service, method);
+        IWARNLOG("Exception(s) in %s::%s - Service not available", service, method);
 	    respStr.append("{\"Code\":-1,\"Exception\":\"Service not available\"}");
     }
     else
@@ -1451,7 +1451,7 @@ int CWsPackageProcessSoapBindingEx::onFinishUpload(IEspContext &ctx, CHttpReques
         else
         {
             StringBuffer msg;
-            WARNLOG("Exception(s) in %s::%s - %s", service, method, me->errorMessage(msg).str());
+            IWARNLOG("Exception(s) in %s::%s - %s", service, method, me->errorMessage(msg).str());
             respStr.appendf("{\"Code\":-1,\"Exception\":\"%s\"}", msg.str());
         }
     }

esp/services/ws_smc/ws_smcService.cpp

@@ -125,7 +125,7 @@ void CWsSMCEx::init(IPropertyTree *cfg, const char *process, const char *service
 {
     if (!daliClientActive())
     {
-        ERRLOG("No Dali Connection Active.");
+        OERRLOG("No Dali Connection Active.");
         throw MakeStringException(-1, "No Dali Connection Active. Please Specify a Dali to connect to in you configuration file");
     }
 
@@ -347,7 +347,7 @@ bool CActivityInfo::readJobQueue(const char* queueName, StringArray& wuids, Stri
     {
         state.set("Unknown");
         stateDetails.set("jobQueueSnapshot not found");
-        WARNLOG("CActivityInfo::readJobQueue: jobQueueSnapshot not found.");
+        IWARNLOG("CActivityInfo::readJobQueue: jobQueueSnapshot not found.");
         return false;
     }
 
@@ -357,7 +357,7 @@ bool CActivityInfo::readJobQueue(const char* queueName, StringArray& wuids, Stri
         jobQueue.setown(jobQueueSnapshot->getJobQueue(queueName));
         if (!jobQueue)
         {
-            WARNLOG("CActivityInfo::readJobQueue: failed to get info for job queue %s", queueName);
+            IWARNLOG("CActivityInfo::readJobQueue: failed to get info for job queue %s", queueName);
             return false;
         }
     }
@@ -561,7 +561,7 @@ CWsSMCTargetCluster* CActivityInfo::findWUClusterInfo(const char* wuid, bool isO
     catch (IException *e)
     {//Exception may be thrown when the openWorkUnit() is called inside the CWUWrapper
         StringBuffer msg;
-        WARNLOG("Failed to open workunit %s: %s", wuid, e->errorMessage(msg).str());
+        IWARNLOG("Failed to open workunit %s: %s", wuid, e->errorMessage(msg).str());
         e->Release();
         return NULL;
     }
@@ -754,7 +754,7 @@ unsigned CActivityInfo::readDFUWUIDs(IPropertyTree* serverStatusRoot, const char
 {
     if (!queueName || !*queueName)
     {
-        WARNLOG("CActivityInfo::readDFUWUIDs: queue name not specified");
+        IWARNLOG("CActivityInfo::readDFUWUIDs: queue name not specified");
         return 0;
     }
 
@@ -782,7 +782,7 @@ unsigned CActivityInfo::readDFUWUIDs(IPropertyTree* serverStatusRoot, const char
     Owned<IJobQueueConst> jobQueue = jobQueueSnapshot->getJobQueue(queueName);
     if (!jobQueue)
     {
-        WARNLOG("CActivityInfo::readDFUWUIDs: failed to get info for job queue %s.", queueName);
+        IWARNLOG("CActivityInfo::readDFUWUIDs: failed to get info for job queue %s.", queueName);
         return runningWUCount;
     }
 
@@ -891,7 +891,7 @@ void CActivityInfo::readServerJobQueueStatus(IEspContext &context, const char* q
 {
     if (!jobQueueSnapshot)
     {
-        WARNLOG("CActivityInfo::readServerJobQueueStatus: jobQueueSnapshot not found.");
+        IWARNLOG("CActivityInfo::readServerJobQueueStatus: jobQueueSnapshot not found.");
         return;
     }
 
@@ -1948,7 +1948,7 @@ bool CWsSMCEx::onBrowseResources(IEspContext &context, IEspBrowseResourcesReques
         const char* ossInstall = pEnvRoot->queryProp("EnvSettings/path");
         if (!ossInstall || !*ossInstall)
         {
-            WARNLOG("Failed to get EnvSettings/Path in environment settings.");
+            OWARNLOG("Failed to get EnvSettings/Path in environment settings.");
             return true;
         }
 
@@ -1957,14 +1957,14 @@ bool CWsSMCEx::onBrowseResources(IEspContext &context, IEspBrowseResourcesReques
         Owned<IFile> f = createIFile(path.str());
         if(!f->exists() || !f->isDirectory())
         {
-            WARNLOG("Invalid resource folder");
+            OWARNLOG("Invalid resource folder");
             return true;
         }
 
         Owned<IDirectoryIterator> di = f->directoryFiles(NULL, false, true);
         if(di.get() == NULL)
         {
-            WARNLOG("Resource folder is empty.");
+            OWARNLOG("Resource folder is empty.");
             return true;
         }
 
@@ -1982,14 +1982,14 @@ bool CWsSMCEx::onBrowseResources(IEspContext &context, IEspBrowseResourcesReques
             Owned<IFile> f0 = createIFile(path0.str());
             if(!f0->exists())
             {
-                WARNLOG("Description file not found for %s", folder.str());
+                OWARNLOG("Description file not found for %s", folder.str());
                 continue;
             }
 
             OwnedIFileIO rIO = f0->openShared(IFOread,IFSHfull);
             if(!rIO)
             {
-                WARNLOG("Failed to open the description file for %s", folder.str());
+                OWARNLOG("Failed to open the description file for %s", folder.str());
                 continue;
             }
 
@@ -2000,21 +2000,21 @@ bool CWsSMCEx::onBrowseResources(IEspContext &context, IEspBrowseResourcesReques
             size32_t nRead = rIO->read(0, (size32_t) fileSize, (char*)tmpBuf.str());
             if (nRead != fileSize)
             {
-                WARNLOG("Failed to read the description file for %s", folder.str());
+                OWARNLOG("Failed to read the description file for %s", folder.str());
                 continue;
             }
 
             Owned<IPropertyTree> desc = createPTreeFromXMLString(tmpBuf.str());
             if (!desc)
             {
-                WARNLOG("Invalid description file for %s", folder.str());
+                OWARNLOG("Invalid description file for %s", folder.str());
                 continue;
             }
 
             Owned<IPropertyTreeIterator> fileIterator = desc->getElements("file");
             if (!fileIterator->first())
             {
-                WARNLOG("Invalid description file for %s", folder.str());
+                OWARNLOG("Invalid description file for %s", folder.str());
                 continue;
             }
 

esp/services/ws_sql/SQL2ECL/ECLEngine.cpp

@@ -62,16 +62,16 @@ void ECLEngine::generateIndexSetupAndFetch(HPCCFilePtr file, SQLTable * table, i
         if (strncmp(indexHintFromSQL.trim().str(), "0", 1)==0)
         {
             avoidindex = true;
-            WARNLOG("Will not use any index.");
+            UWARNLOG("Will not use any index.");
             return;
         }
         else
-            WARNLOG("Empty index hint found!");
+            UWARNLOG("Empty index hint found!");
     }
 
     findAppropriateIndex(file, indexHintFromSQL.str(), selectsqlobj, indexname);
     if (indexHintFromSQL.length() > 0 && indexname.length() == 0)
-        WARNLOG("Unusable index hint detected.");
+        UWARNLOG("Unusable index hint detected.");
 
     if (indexname.length()>0)
     {
@@ -120,12 +120,12 @@ void ECLEngine::generateIndexSetupAndFetch(HPCCFilePtr file, SQLTable * table, i
 
             if (isPayloadIndex)
             {
-                WARNLOG(" as PAYLOAD");
+                UWARNLOG(" as PAYLOAD");
                 idxsetupstr.appendf("IdxDS%d := Idx%d(%s", tableindex, tableindex, keyedAndWild.str());
             }
             else
             {
-                WARNLOG(" Not as PAYLOAD");
+                UWARNLOG(" Not as PAYLOAD");
                 idxsetupstr.appendf("IdxDS%d := FETCH(TblDS%d, Idx%d( %s ), RIGHT.%s", tableindex, tableindex, tableindex, keyedAndWild.str(), indexfile->getIdxFilePosField());
             }
             idxsetupstr.append(");\n");
@@ -134,7 +134,7 @@ void ECLEngine::generateIndexSetupAndFetch(HPCCFilePtr file, SQLTable * table, i
             eclEntities->appendProp("IndexRead", idxsetupstr.str());
         }
         else
-            WARNLOG("NOT USING INDEX!");
+            UWARNLOG("NOT USING INDEX!");
     }
 }
 
@@ -299,7 +299,7 @@ void ECLEngine::generateSelectECL(HPCCSQLTreeWalker * selectsqlobj, StringBuffer
 
                 if (tablejoin->getOnClause() != NULL && !tablejoin->getOnClause()->containsEqualityCondition(translator, "LEFT", "RIGHT"))
                 {
-                    WARNLOG("Warning: No Join EQUALITY CONDITION detected!, using ECL ALL option");
+                    UWARNLOG("Warning: No Join EQUALITY CONDITION detected!, using ECL ALL option");
                     out.append(", ALL");
                 }
 

esp/services/ws_sql/SQL2ECL/HPCCFileCache.cpp

@@ -270,7 +270,7 @@ HPCCFile * HPCCFileCache::fetchHpccFileByName(const char * filename, const char
                 {
                     StringBuffer s;
                     se->errorMessage(s);
-                    DBGLOG("Error fetching keyed file %s info: %s", filename, s.str());
+                    IERRLOG("Error fetching keyed file %s info: %s", filename, s.str());
                     se->Release();
                     if (file)
                         file.clear();
@@ -292,7 +292,7 @@ HPCCFile * HPCCFileCache::fetchHpccFileByName(const char * filename, const char
     {
         StringBuffer s;
         se->errorMessage(s);
-        DBGLOG("Error fetching file %s info: %s", filename, s.str());
+        IERRLOG("Error fetching file %s info: %s", filename, s.str());
         se->Release();
         if (file)
             file.clear();

esp/services/ws_sql/SQL2ECL/HPCCSQLTreeWalker.cpp

@@ -125,7 +125,7 @@ void HPCCSQLTreeWalker::fromTreeWalker(pANTLR3_BASE_TREE fromsqlAST)
 
                         const char * fullindexhintname = tmpHPCCFileCache->cacheHpccFileByName(tablealias);
                         if (!fullindexhintname || !*fullindexhintname)
-                            ERRLOG("Invalid index hint found: %s\n", tablealias);
+                            IERRLOG("Invalid index hint found: %s\n", tablealias);
                         else
                             temptable->setIndexhint(fullindexhintname);
                     }
@@ -136,11 +136,11 @@ void HPCCSQLTreeWalker::fromTreeWalker(pANTLR3_BASE_TREE fromsqlAST)
                     else if ( childType == TOKEN_TABLE_SCHEMA && tablechild->getChildCount(tablechild) == 1)
                     {
                         pANTLR3_BASE_TREE schema = (pANTLR3_BASE_TREE)tablechild->getChild(tablechild, 0);
-                        WARNLOG("Table schema detected but ignored: %s\n", (char *)schema->toString(schema)->chars);
+                        UWARNLOG("Table schema detected but ignored: %s\n", (char *)schema->toString(schema)->chars);
                     }
                     else
                     {
-                        ERRLOG("Invalid node found in table node: %s\n", (char *)tablechild->toString(tablechild)->chars);
+                        UERRLOG("Invalid node found in table node: %s\n", (char *)tablechild->toString(tablechild)->chars);
                     }
                 }
 

esp/services/ws_sql/SQL2ECL/SQLExpression.cpp

@@ -576,14 +576,14 @@ void SQLBinaryExpression::toECLStringTranslateSource(
 
             if (translation1.length() != 0)
             {
-                WARNLOG("Operand 1 of binary expression could not be translated.");
+                UWARNLOG("Operand 1 of binary expression could not be translated.");
                 eclStr.append(translation1);
                 eclStr.append(getOpStr());
                 eclStr.append(convert);
             }
             else
             {
-                WARNLOG("Operand 2 of binary expression could not be translated.");
+                UWARNLOG("Operand 2 of binary expression could not be translated.");
                 eclStr.append(convert);
                 eclStr.append(getOpStr());
                 eclStr.append(translation2);
@@ -591,13 +591,13 @@ void SQLBinaryExpression::toECLStringTranslateSource(
         }
         else
         {
-            WARNLOG("Binary expression could not be translated.");
+            UWARNLOG("Binary expression could not be translated.");
             return;
         }
     }
     else
     {
-        WARNLOG("Binary expression could not be translated.");
+        UWARNLOG("Binary expression could not be translated.");
         return;
     }
 }

esp/services/ws_sql/ws_sqlService.cpp

@@ -316,7 +316,7 @@ bool CwssqlEx::onGetDBSystemInfo(IEspContext &context, IEspGetDBSystemInfoReques
     }
     catch (...)
     {
-        ERRLOG("Error Parsing HPCC and/or WsSQL Version string.");
+        IERRLOG("Error Parsing HPCC and/or WsSQL Version string.");
     }
 
     return success;
@@ -638,7 +638,7 @@ printTree(sqlAST, 0);
         }
         catch (...)
         {
-            ERRLOG("!!! Unable to free HPCCSQL parser/lexer objects.");
+            IERRLOG("!!! Unable to free HPCCSQL parser/lexer objects.");
         }
 
         //All IExceptions get bubbled up
@@ -661,7 +661,7 @@ printTree(sqlAST, 0);
         }
         catch (...)
         {
-            ERRLOG("!!! Unable to free HPCCSQL parser/lexer objects.");
+            IERRLOG("!!! Unable to free HPCCSQL parser/lexer objects.");
         }
 
         //All other unexpected exceptions are reported as generic ecl generation error.

esp/services/ws_store/espstorelib/daliKVStore.cpp

@@ -35,7 +35,7 @@ bool CDALIKVStore::createStore(const char * apptype, const char * storename, con
     VStringBuffer xpath("Store[%s='%s'][1]", DALI_KVSTORE_NAME_ATT,  storename);
     if (root->hasProp(xpath.str()))
     {
-        WARNLOG("DALI KV Store: Cannot create app '%s' entry, it already exists", storename);
+        IWARNLOG("DALI KV Store: Cannot create app '%s' entry, it already exists", storename);
         return false;
     }
 

esp/services/ws_topology/ws_topologyService.cpp

@@ -51,7 +51,7 @@ void CWsTopologyEx::init(IPropertyTree *cfg, const char *process, const char *se
 
     if (!daliClientActive())
     {
-        ERRLOG("No Dali Connection Active.");
+        OERRLOG("No Dali Connection Active.");
         throw MakeStringException(ECLWATCH_CANNOT_CONNECT_DALI, "No Connection to Dali server is active. Please specify a Dali server in the configuration file.");
     }
 

esp/services/ws_workunits/ws_workunitsHelpers.cpp

@@ -311,7 +311,7 @@ void WsWuInfo::getSourceFiles(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setSourceFilesDesc(eMsg.str());
         e->Release();
     }
@@ -350,7 +350,7 @@ void WsWuInfo::getVariables(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setVariablesDesc(eMsg.str());
         e->Release();
     }
@@ -459,7 +459,7 @@ void WsWuInfo::getTimers(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setTimersDesc(eMsg.str());
         e->Release();
     }
@@ -497,7 +497,7 @@ unsigned WsWuInfo::getTimerCount()
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         e->Release();
     }
 
@@ -524,7 +524,7 @@ void WsWuInfo::getHelpers(IEspECLWorkunit &info, unsigned long flags)
         Owned <IConstWUQuery> query = cw->getQuery();
         if(!query)
         {
-            ERRLOG("Cannot get Query for this workunit.");
+            IERRLOG("Cannot get Query for this workunit.");
             info.setHelpersDesc("Cannot get Query for this workunit.");
         }
         else
@@ -632,7 +632,7 @@ void WsWuInfo::getHelpers(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setHelpersDesc(eMsg.str());
         e->Release();
     }
@@ -662,7 +662,7 @@ void WsWuInfo::getApplicationValues(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setApplicationValuesDesc(eMsg.str());
         e->Release();
     }
@@ -704,7 +704,7 @@ void WsWuInfo::getDebugValues(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setDebugValuesDesc(eMsg.str());
         e->Release();
     }
@@ -740,7 +740,7 @@ bool WsWuInfo::hasSubGraphTimings()
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         e->Release();
     }
 
@@ -827,7 +827,7 @@ void WsWuInfo::getGraphInfo(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setGraphsDesc(eMsg.str());
         e->Release();
     }
@@ -1063,7 +1063,7 @@ unsigned WsWuInfo::getWorkunitThorLogInfo(IArrayOf<IEspECLHelpFile>& helpers, IE
         Owned<IConstWUClusterInfo> clusterInfo = getTargetClusterInfo(clusterName.str());
         if (!clusterInfo)
         {
-            WARNLOG("Cannot find TargetClusterInfo for workunit %s", cw->queryWuid());
+            IWARNLOG("Cannot find TargetClusterInfo for workunit %s", cw->queryWuid());
             return countThorLog;
         }
 
@@ -1125,7 +1125,7 @@ unsigned WsWuInfo::getWorkunitThorLogInfo(IArrayOf<IEspECLHelpFile>& helpers, IE
                 const char* ppStr = strstr(pStr, "/thormaster.");
                 if (!ppStr)
                 {
-                    WARNLOG("Invalid thorlog entry in workunit xml: %s", logName.str());
+                    IWARNLOG("Invalid thorlog entry in workunit xml: %s", logName.str());
                     continue;
                 }
 
@@ -1196,7 +1196,7 @@ unsigned WsWuInfo::getWorkunitThorLogInfo(IArrayOf<IEspECLHelpFile>& helpers, IE
                 const char* ppStr = strstr(pStr, logDir.str());
                 if (!ppStr)
                 {
-                    WARNLOG("Invalid thorlog entry in workunit xml: %s", val.str());
+                    IWARNLOG("Invalid thorlog entry in workunit xml: %s", val.str());
                     continue;
                 }
 
@@ -1206,7 +1206,7 @@ unsigned WsWuInfo::getWorkunitThorLogInfo(IArrayOf<IEspECLHelpFile>& helpers, IE
                 ppStr = strchr(pProcessName + 1, sep);
                 if (!ppStr)
                 {
-                    WARNLOG("Invalid thorlog entry in workunit xml: %s", val.str());
+                    IWARNLOG("Invalid thorlog entry in workunit xml: %s", val.str());
                     continue;
                 }
                 processName.setLength(ppStr - pProcessName - 1);
@@ -1329,7 +1329,7 @@ void WsWuInfo::getWorkflow(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setWorkflowsDesc(eMsg.str());
         e->Release();
     }
@@ -1583,7 +1583,7 @@ void WsWuInfo::getResults(IEspECLWorkunit &info, unsigned long flags)
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         info.setResultsDesc(eMsg.str());
         e->Release();
     }
@@ -1821,7 +1821,7 @@ bool WsWuInfo::getResourceInfo(StringArray &viewnames, StringArray &urls, unsign
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         e->Release();
     }
 
@@ -1839,7 +1839,7 @@ unsigned WsWuInfo::getResourceURLCount()
     catch(IException* e)
     {
         StringBuffer eMsg;
-        ERRLOG("%s", e->errorMessage(eMsg).str());
+        IERRLOG("%s", e->errorMessage(eMsg).str());
         e->Release();
     }
 
@@ -3060,7 +3060,7 @@ int WUSchedule::run()
                         catch(IException *e)
                         {
                             StringBuffer msg;
-                            ERRLOG("Exception %d:%s in WsWorkunits Schedule::run while processing WU", e->errorCode(), e->errorMessage(msg).str());
+                            IERRLOG("Exception %d:%s in WsWorkunits Schedule::run while processing WU", e->errorCode(), e->errorMessage(msg).str());
                             e->Release();
                         }
                     }
@@ -3069,17 +3069,17 @@ int WUSchedule::run()
             catch(IException *e)
             {
                 StringBuffer msg;
-                ERRLOG("Exception %d:%s in WsWorkunits Schedule::run while fetching scheduled WUs from DALI", e->errorCode(), e->errorMessage(msg).str());
+                IERRLOG("Exception %d:%s in WsWorkunits Schedule::run while fetching scheduled WUs from DALI", e->errorCode(), e->errorMessage(msg).str());
                 e->Release();
             }
             catch(...)
             {
-                ERRLOG("Unknown exception in WsWorkunits Schedule::run while fetching scheduled WUs from DALI");
+                IERRLOG("Unknown exception in WsWorkunits Schedule::run while fetching scheduled WUs from DALI");
             }
         }
         else
         {
-            WARNLOG("Detached from DALI, WSWorkuinits schedule interrupted");
+            OWARNLOG("Detached from DALI, WSWorkunits schedule interrupted");
             waitTimeMillies = (unsigned)-1;
         }
 
@@ -3453,7 +3453,7 @@ void CWsWuFileHelper::createProcessLogfile(Owned<IConstWorkUnit>& cwu, WsWuInfo&
         {
             StringBuffer s;
             e->errorMessage(s);
-            DBGLOG("Error accessing Process Log file %s: %s", logSpec.str(), s.str());
+            IERRLOG("Error accessing Process Log file %s: %s", logSpec.str(), s.str());
             writeToFile(fileName.str(), s.length(), s.str());
             e->Release();
         }
@@ -3470,7 +3470,7 @@ void CWsWuFileHelper::createThorSlaveLogfile(Owned<IConstWorkUnit>& cwu, WsWuInf
     Owned<IConstWUClusterInfo> clusterInfo = getTargetClusterInfo(clusterName);
     if (!clusterInfo)
     {
-        WARNLOG("Cannot find TargetClusterInfo for workunit %s", cwu->queryWuid());
+        OWARNLOG("Cannot find TargetClusterInfo for workunit %s", cwu->queryWuid());
         return;
     }
 
@@ -3506,7 +3506,7 @@ void CWsWuFileHelper::createThorSlaveLogfile(Owned<IConstWorkUnit>& cwu, WsWuInf
             const char* ppStr = strstr(pStr, "/thormaster.");
             if (!ppStr)
             {
-                WARNLOG("Invalid thorlog entry in workunit xml: %s", logName.str());
+                IWARNLOG("Invalid thorlog entry in workunit xml: %s", logName.str());
                 continue;
             }
             ppStr += 12;
@@ -3639,7 +3639,7 @@ void CWsWuFileHelper::createZAPECLQueryArchiveFiles(Owned<IConstWorkUnit>& cwu,
             Owned<IFile> rFile = createIFile(rfn);
             if (!rFile)
             {
-                DBGLOG("Cannot open %s on %s", ssb.str(), ip.str());
+                OERRLOG("Cannot open %s on %s", ssb.str(), ip.str());
                 continue;
             }
             archiveContents.loadFile(rFile);
@@ -3648,7 +3648,7 @@ void CWsWuFileHelper::createZAPECLQueryArchiveFiles(Owned<IConstWorkUnit>& cwu,
         {
             StringBuffer s;
             e->errorMessage(s);
-            DBGLOG("Error accessing archive file %s: %s", ssb.str(), s.str());
+            OERRLOG("Error accessing archive file %s: %s", ssb.str(), s.str());
             archiveContents.insert(0, "Error accessing archive file ").appendf("%s: %s\r\n\r\n", ssb.str(), s.str());
             e->Release();
         }

esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -509,14 +509,14 @@ bool reloadCluster(IConstWUClusterInfo *clusterInfo, unsigned wait)
         catch(IMultiException *me)
         {
             StringBuffer err;
-            DBGLOG("ERROR control:reloading roxie query info %s", me->errorMessage(err.append(me->errorCode()).append(' ')).str());
+            IERRLOG("ERROR control:reloading roxie query info %s", me->errorMessage(err.append(me->errorCode()).append(' ')).str());
             me->Release();
             return false;
         }
         catch(IException *e)
         {
             StringBuffer err;
-            DBGLOG("ERROR control:reloading roxie query info %s", e->errorMessage(err.append(e->errorCode()).append(' ')).str());
+            IERRLOG("ERROR control:reloading roxie query info %s", e->errorMessage(err.append(e->errorCode()).append(' ')).str());
             e->Release();
             return false;
         }
@@ -796,14 +796,14 @@ bool CWsWorkunitsEx::isQuerySuspended(const char* query, IConstWUClusterInfo *cl
     catch(IMultiException *me)
     {
         StringBuffer err;
-        DBGLOG("ERROR control:queries roxie query info %s", me->errorMessage(err.append(me->errorCode()).append(' ')).str());
+        IERRLOG("ERROR control:queries roxie query info %s", me->errorMessage(err.append(me->errorCode()).append(' ')).str());
         me->Release();
         return false;
     }
     catch(IException *e)
     {
         StringBuffer err;
-        DBGLOG("ERROR control:queries roxie query info %s", e->errorMessage(err.append(e->errorCode()).append(' ')).str());
+        IERRLOG("ERROR control:queries roxie query info %s", e->errorMessage(err.append(e->errorCode()).append(' ')).str());
         e->Release();
         return false;
     }
@@ -1059,7 +1059,7 @@ void retrieveQuerysetDetailsFromAlias(IEspContext &context, IPropertyTree *regis
     Owned<IPropertyTreeIterator> regAliases = registry->getElements(xpath.str());
     if (!regAliases->first())
     {
-        DBGLOG("Alias %s not found", name);
+        UWARNLOG("Alias %s not found", name);
         return;
     }
 
@@ -1074,7 +1074,7 @@ void retrieveQuerysetDetailsFromAlias(IEspContext &context, IPropertyTree *regis
         IPropertyTree *query = registry->queryPropTree(xpath);
         if (!query)
         {
-            DBGLOG("No matching Query %s found for Alias %s", a->getId(), name);
+            UWARNLOG("No matching Query %s found for Alias %s", a->getId(), name);
             return;
         }
 
@@ -1095,7 +1095,7 @@ void retrieveQuerysetDetailsFromQuery(IEspContext &context, IPropertyTree *regis
     Owned<IPropertyTreeIterator> regQueries = registry->getElements(xpath.str());
     if (!regQueries->first())
     {
-        DBGLOG("No matching Query %s found for %s", value, type);
+        UWARNLOG("No matching Query %s found for %s", value, type);
         return;
     }
 
@@ -1350,7 +1350,7 @@ void CWsWorkunitsEx::checkAndSetClusterQueryState(IEspContext &context, const ch
         Owned<IPropertyTree> queriesOnCluster = getQueriesOnCluster(cluster, querySetId, checkAllNodes);
         if (!queriesOnCluster)
         {
-            DBGLOG("getQueriesOnCluster() returns NULL for cluster<%s> and querySetId<%s>", cluster, querySetId);
+            UWARNLOG("getQueriesOnCluster() returns NULL for cluster<%s> and querySetId<%s>", cluster, querySetId);
             return;
         }
 
@@ -2122,14 +2122,14 @@ bool CWsWorkunitsEx::getQueryFiles(IEspContext &context, const char* wuid, const
     catch(IMultiException *me)
     {
         StringBuffer err;
-        DBGLOG("ERROR control:getQueryXrefInfo roxie query info %s", me->errorMessage(err.append(me->errorCode()).append(' ')).str());
+        IERRLOG("ERROR control:getQueryXrefInfo roxie query info %s", me->errorMessage(err.append(me->errorCode()).append(' ')).str());
         me->Release();
         return false;
     }
     catch(IException *e)
     {
         StringBuffer err;
-        DBGLOG("ERROR control:getQueryXrefInfo roxie query info %s", e->errorMessage(err.append(e->errorCode()).append(' ')).str());
+        IERRLOG("ERROR control:getQueryXrefInfo roxie query info %s", e->errorMessage(err.append(e->errorCode()).append(' ')).str());
         e->Release();
         return false;
     }

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -121,7 +121,7 @@ bool doAction(IEspContext& context, StringArray& wuids, CECLWUActions action, IP
         const char* wuid = wuidStr.trim().str();
         if (isEmpty(wuid))
         {
-            WARNLOG("Empty Workunit ID");
+            UWARNLOG("Empty Workunit ID");
             continue;
         }
 
@@ -264,7 +264,7 @@ bool doAction(IEspContext& context, StringArray& wuids, CECLWUActions action, IP
             StringBuffer eMsg;
             StringBuffer failedMsg("Failed: ");
             setActionResult(wuid, action, failedMsg.append(e->errorMessage(eMsg)).str(), strAction, results);
-            WARNLOG("Failed to %s for workunit: %s, %s", strAction, wuid, eMsg.str());
+            OWARNLOG("Failed to %s for workunit: %s, %s", strAction, wuid, eMsg.str());
             AuditSystemAccess(context.queryUserId(), false, "Failed to %s %s", strAction, wuid);
             e->Release();
             continue;
@@ -275,7 +275,7 @@ bool doAction(IEspContext& context, StringArray& wuids, CECLWUActions action, IP
             StringBuffer failedMsg;
             failedMsg.appendf("Unknown exception");
             setActionResult(wuid, action, failedMsg.str(), strAction, results);
-            WARNLOG("Failed to %s for workunit: %s, %s", strAction, wuid, failedMsg.str());
+            IWARNLOG("Failed to %s for workunit: %s, %s", strAction, wuid, failedMsg.str());
             AuditSystemAccess(context.queryUserId(), false, "Failed to %s %s", strAction, wuid);
             continue;
         }
@@ -353,7 +353,7 @@ void CWsWorkunitsEx::init(IPropertyTree *cfg, const char *process, const char *s
 {
     if (!daliClientActive())
     {
-        ERRLOG("No Dali Connection Active.");
+        OERRLOG("No Dali Connection Active.");
         throw MakeStringException(-1, "No Dali Connection Active. Please Specify a Dali to connect to in you configuration file");
     }
     setPasswordsFromSDS();
@@ -2448,7 +2448,7 @@ public:
             const char* wuid = wuDataArray.item(0);
             if (isEmpty(wuid))
             {
-                WARNLOG("Empty WUID in SCA_LIST response"); // JCS->KW - have u ever seen this happen?
+                IWARNLOG("Empty WUID in SCA_LIST response"); // JCS->KW - have u ever seen this happen?
                 continue;
             }
             const char* owner = wuDataArray.item(1);
@@ -5360,7 +5360,7 @@ bool CWsWorkunitsEx::onWUEclDefinitionAction(IEspContext &context, IEspWUEclDefi
         {
             StringBuffer eclDefinitionName = eclDefinitions.item(i);
             if (eclDefinitionName.trim().isEmpty())
-                WARNLOG("Empty ECL Definition name in WUEclDefinitionAction request");
+                UWARNLOG("Empty ECL Definition name in WUEclDefinitionAction request");
             else if (action == CEclDefinitionActions_SyntaxCheck)
                 checkEclDefinitionSyntax(context, target.str(), eclDefinitionName.str(), msToWait, results);
             else if (action == CEclDefinitionActions_Deploy)

esp/smc/SMCLib/LogicFileWrapper.cpp

@@ -49,11 +49,11 @@ void LogicFileWrapper::FindClusterName(const char* logicalName, StringBuffer& re
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception thrown within LogicFileWrapper::FindClusterName");
+        IWARNLOG("Unknown Exception thrown within LogicFileWrapper::FindClusterName");
     }
 }
 
@@ -117,11 +117,11 @@ bool LogicFileWrapper::doCompressFile(const char* name,StringBuffer& returnStr,
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within doCompressFile");
+        IWARNLOG("Unknown Exception caught within doCompressFile");
     }
 
     return true; 

esp/smc/SMCLib/LogicFileWrapper.hpp

@@ -103,12 +103,12 @@ struct DeleteTask: public CInterface, implements ITask
             {
                 StringBuffer str;
                 e->errorMessage(str);
-                PrintLog(str.str());
+                OERRLOG("%s",str.str());
                 e->Release();
             }
             catch(...)
             {
-                PrintLog("Unknown Exception thrown while deleteing file part\n");
+                IERRLOG("Unknown Exception thrown while deleting file part\n");
             }
         }
         if(errs.length())
@@ -146,7 +146,7 @@ struct CompressTask: public CInterface, implements ITask
         }
         catch(...)
         {
-            PrintLog("Unknown Exception thrown\n");
+            IERRLOG("Unknown Exception thrown\n");
         }
         return 0;
     }

esp/smc/SMCLib/TpWrapper.cpp

@@ -128,18 +128,18 @@ void CTpWrapper::getClusterMachineList(double clientVersion,
             getThorSpareMachineList(clientVersion, ClusterName, ClusterDirectory, MachineList);
         }
         else if (strcmp("HOLESTANDBYNODES",ClusterType) == 0)
-      {
+        {
             getMachineList(eqHoleStandbyProcess,path.str(),"", ClusterDirectory, MachineList);
-      }
+        }
     }
     catch(IException* e){   
-      StringBuffer msg;
-      e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        StringBuffer msg;
+        e->errorMessage(msg);
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CTpWrapper::getClusterMachineList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getClusterMachineList");
     }
 }
 
@@ -977,11 +977,11 @@ void CTpWrapper::queryTargetClusters(double version, const char* clusterType, co
     catch(IException* e){   
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CTpWrapper::getClusterList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getClusterList");
     }
 }
 
@@ -1137,11 +1137,11 @@ void CTpWrapper::getClusterProcessList(const char* ClusterType, IArrayOf<IEspTpC
     catch(IException* e){   
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CTpWrapper::getClusterList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getClusterList");
     }
 }
 
@@ -1232,11 +1232,11 @@ void CTpWrapper::getHthorClusterList(IArrayOf<IEspTpCluster>& clusterList)
     catch(IException* e){   
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CTpWrapper::getHthorClusterList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getHthorClusterList");
     }
 }
 
@@ -1272,12 +1272,12 @@ void CTpWrapper::getGroupList(double espVersion, const char* kindReq, IArrayOf<I
     {
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...)
     {
-        WARNLOG("Unknown Exception caught within CTpWrapper::getGroupList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getGroupList");
     }
 }
 
@@ -1337,11 +1337,11 @@ void CTpWrapper::resolveGroupInfo(const char* groupName,StringBuffer& Cluster, S
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CTpWrapper::resolveGroupInfo");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::resolveGroupInfo");
     }
 }
 
@@ -1446,7 +1446,7 @@ void CTpWrapper::appendMachineList(double clientVersion, IConstEnvironment* cons
     node.endpoint().getIpText(netAddress);
     if (netAddress.length() == 0)
     {
-        WARNLOG("Net address not found for a node of %s", clusterName);
+        OWARNLOG("Net address not found for a node of %s", clusterName);
         return;
     }
 
@@ -1495,12 +1495,12 @@ void CTpWrapper::getThorSlaveMachineList(double clientVersion, const char* clust
     {
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...)
     {
-        WARNLOG("Unknown Exception caught within CTpWrapper::getMachineList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getMachineList");
     }
 
     return;
@@ -1537,12 +1537,12 @@ void CTpWrapper::getThorSpareMachineList(double clientVersion, const char* clust
     {
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...)
     {
-        WARNLOG("Unknown Exception caught within CTpWrapper::getMachineList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getMachineList");
     }
 
     return;
@@ -1604,11 +1604,11 @@ void CTpWrapper::getMachineList(const char* MachineType,
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CTpWrapper::getMachineList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getMachineList");
     }
 
 }
@@ -1649,7 +1649,7 @@ void CTpWrapper::getDropZoneMachineList(double clientVersion, bool ECLWatchVisib
     }
     catch(...)
     {
-        WARNLOG("Unknown Exception caught within CTpWrapper::getDropZoneMachineList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getDropZoneMachineList");
     }
     
 }
@@ -1919,11 +1919,11 @@ void CTpWrapper::setMachineInfo(const char* name,const char* type,IEspTpMachine&
     catch(IException* e){   
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CTpWrapper::getDropZoneList");
+        IWARNLOG("Unknown Exception caught within CTpWrapper::getDropZoneList");
     }
 }
 

esp/smc/SMCLib/WUXMLInfo.cpp

@@ -62,13 +62,13 @@ void CWUXMLInfo::buildXmlActiveWuidStatus(const char* ClusterName, IEspECLWorkun
         }
     }
     catch(IException* e){   
-      StringBuffer msg;
-      e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        StringBuffer msg;
+        e->errorMessage(msg);
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlActiveWuidStatus");
+        IWARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlActiveWuidStatus");
     }
 
 }
@@ -98,11 +98,11 @@ bool CWUXMLInfo::buildXmlWuidInfo(IConstWorkUnit &wu, IEspECLWorkunit& wuStructu
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlWuidInfo");
+        IWARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlWuidInfo");
     }
     return true;
 }
@@ -122,11 +122,11 @@ bool CWUXMLInfo::buildXmlWuidInfo(const char* wuid, IEspECLWorkunit& wuStructure
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlWuidInfo");
+        IWARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlWuidInfo");
     }
     return false;
 }
@@ -154,12 +154,12 @@ bool CWUXMLInfo::buildXmlWuidInfo(IConstWorkUnit &wu, StringBuffer& wuStructure,
     {
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...)
     {
-        WARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlWuidInfo");
+        IWARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlWuidInfo");
     }
     return true;
 }
@@ -185,11 +185,11 @@ bool CWUXMLInfo::buildXmlGraphList(IConstWorkUnit &wu,IPropertyTree& XMLStructur
     catch(IException* e) {
         StringBuffer msg;
         e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...) {
-        WARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlGraphList");
+        IWARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlGraphList");
     }
     return true;
 }
@@ -212,11 +212,11 @@ bool CWUXMLInfo::buildXmlExceptionList(IConstWorkUnit &wu,IPropertyTree& XMLStru
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlExceptionList");
+        IWARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlExceptionList");
     }
     return true;
 }
@@ -285,11 +285,11 @@ bool CWUXMLInfo::buildXmlResultList(IConstWorkUnit &wu,IPropertyTree& XMLStructu
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlExceptionList");
+        IWARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlExceptionList");
     }
     return true;
 }
@@ -331,11 +331,11 @@ bool CWUXMLInfo::buildXmlLogList(IConstWorkUnit &wu,IPropertyTree& XMLStructure)
     catch(IException* e){   
       StringBuffer msg;
       e->errorMessage(msg);
-        WARNLOG("%s", msg.str());
+        IWARNLOG("%s", msg.str());
         e->Release();
     }
     catch(...){
-        WARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlLogList");
+        IWARNLOG("Unknown Exception caught within CWUXMLInfo::buildXmlLogList");
     }
     return true;
 }

esp/test/httptest/httptest.cpp

@@ -527,19 +527,19 @@ int HttpClient::sendRequest(int times, HttpStat& stat, StringBuffer& req)
         catch(IException *excpt)
         {
             StringBuffer errMsg;
-            DBGLOG("Error connecting to %s:%d - %d:%s", m_host.str(), m_port, excpt->errorCode(), excpt->errorMessage(errMsg).str());
+            UERRLOG("Error connecting to %s:%d - %d:%s", m_host.str(), m_port, excpt->errorCode(), excpt->errorMessage(errMsg).str());
             continue;
         }
         catch(...)
         {
-            DBGLOG("can't connect to %s:%d", m_host.str(), m_port);
+            OERRLOG("Can't connect to %s:%d", m_host.str(), m_port);
             continue;
         }
 
         if(socket.get() == NULL)
         {
             StringBuffer urlstr;
-            DBGLOG(">>Can't connect to %s", ep.getUrlStr(urlstr).str());
+            OERRLOG("Can't connect to %s", ep.getUrlStr(urlstr).str());
             continue;
         }
 
@@ -679,10 +679,10 @@ int HttpServer::start()
             handleOneRequest(client);
         } catch (IException* e) {
             StringBuffer msg;
-            DBGLOG("Exception occured: %s", e->errorMessage(msg).str());
+            IERRLOG("Exception occured: %s", e->errorMessage(msg).str());
             e->Release();
         } catch (...) {
-            DBGLOG("Unknown exception occurred");
+            IERRLOG("Unknown exception occurred");
         }
     }
 
@@ -857,7 +857,7 @@ int COneServerHttpProxyThread::start()
         if(socket2.get() == NULL)
         {
             StringBuffer urlstr;
-            DBGLOG(">>Can't connect to %s", ep.getUrlStr(urlstr).str());
+            OERRLOG("Can't connect to %s", ep.getUrlStr(urlstr).str());
             return -1;
         }
 
@@ -894,12 +894,12 @@ int COneServerHttpProxyThread::start()
     catch(IException *excpt)
     {
         StringBuffer errMsg;
-        DBGLOG("%s", excpt->errorMessage(errMsg).str());
+        OERRLOG("%s", excpt->errorMessage(errMsg).str());
         return -1;
     }
     catch(...)
     {
-        DBGLOG("unknown exception");
+        OERRLOG("unknown exception");
         return -1;
     }
 
@@ -1101,12 +1101,12 @@ int CHttpProxyThread::run()
     catch(IException *excpt)
     {
         StringBuffer errMsg;
-        DBGLOG("%s", excpt->errorMessage(errMsg).str());
+        IERRLOG("%s", excpt->errorMessage(errMsg).str());
         ret = -1;
     }
     catch(...)
     {
-        DBGLOG("unknown exception");
+        IERRLOG("unknown exception");
         ret = -1;
     }
 
@@ -1156,14 +1156,14 @@ int CHttpProxyThread::readline(ISocket* socket, char* buf, int bufsize, bool& so
         StringBuffer estr;
         if(e->errorCode() != JSOCKERR_graceful_close)
         {
-            DBGLOG("socket(%d) : %s", socket->OShandle(), e->errorMessage(estr).str());
+            OERRLOG("socket(%d) : %s", socket->OShandle(), e->errorMessage(estr).str());
         }
         e->Release();
         socketclosed = true;
     }
     catch(...)
     {
-        DBGLOG("Unknown exception reading from socket(%d).", socket->OShandle());
+        OERRLOG("Unknown exception reading from socket(%d).", socket->OShandle());
         socketclosed = true;
     }
 
@@ -1222,11 +1222,11 @@ int HttpProxy::start()
         catch(IException *excpt)
         {
             StringBuffer errMsg;
-            DBGLOG("%s", excpt->errorMessage(errMsg).str());
+            OERRLOG("%s", excpt->errorMessage(errMsg).str());
         }
         catch(...)
         {
-            DBGLOG("unknown exception");
+            IERRLOG("unknown exception");
         }
     }
     return 0;

esp/test/httptest/main.cpp

@@ -288,12 +288,12 @@ int main(int argc, char* argv[])
     catch(IException *excpt)
     {
         StringBuffer errMsg;
-        DBGLOG("Error - %d:%s", excpt->errorCode(), excpt->errorMessage(errMsg).str());
+        IERRLOG("Error - %d:%s", excpt->errorCode(), excpt->errorMessage(errMsg).str());
         return -1;
     }
     catch(...)
     {
-        DBGLOG("Unknown exception");
+        IERRLOG("Unknown exception");
         return -1;
     }
 

esp/tools/soapplus/EspLogDeserializer.cpp

@@ -200,7 +200,7 @@ static void LoadMethodMappings()
 
     int rc = ferror(fp);
     if (rc)
-        ERRLOG("Loading EspMethods.txt failed (may be partially loaded), system error code: %d", rc);
+        OERRLOG("Loading EspMethods.txt failed (may be partially loaded), system error code: %d", rc);
     fclose(fp);
 }
 
@@ -357,7 +357,7 @@ bool loadEspLog(const char* logFileName, HttpClient& httpClient, HttpStat& httpS
 {
     if (!logFileName || !*logFileName)
     {
-        ERRLOG("Input log file name not specified.");
+        OERRLOG("Input log file name not specified.");
         return false;
     }
 
@@ -367,7 +367,7 @@ bool loadEspLog(const char* logFileName, HttpClient& httpClient, HttpStat& httpS
     int maxInstances = httpClient.queryGlobals()->getPropInt("items", -1);
     if (maxInstances == 0)
     {
-        ERRLOG("Maximum instances specified with -n option cannot be 0.");
+        OERRLOG("Maximum instances specified with -n option cannot be 0.");
         return false;
     }
 

esp/tools/soapplus/http.cpp

@@ -1756,19 +1756,19 @@ int HttpClient::sendRequest(StringBuffer& req, IFileIO* request_output, IFileIO*
     catch(IException *excpt)
     {
         StringBuffer errMsg;
-        DBGLOG("Error connecting to %s:%d - %d:%s", m_host.str(), m_port, excpt->errorCode(), excpt->errorMessage(errMsg).str());
+        OERRLOG("Error connecting to %s:%d - %d:%s", m_host.str(), m_port, excpt->errorCode(), excpt->errorMessage(errMsg).str());
         return -1;
     }
     catch(...)
     {
-        DBGLOG("can't connect to %s:%d", m_host.str(), m_port);
+        IERRLOG("can't connect to %s:%d", m_host.str(), m_port);
         return -1;
     }
 
     if(socket.get() == NULL)
     {
         StringBuffer urlstr;
-        DBGLOG(">>Can't connect to %s", ep.getUrlStr(urlstr).str());
+        OERRLOG("Can't connect to %s", ep.getUrlStr(urlstr).str());
         return -1;
     }
 

esp/tools/soapplus/httpproxy.cpp

@@ -212,7 +212,7 @@ int COneServerHttpProxyThread::start()
         if(socket2.get() == NULL)
         {
             StringBuffer urlstr;
-            DBGLOG(">>Can't connect to %s", ep.getUrlStr(urlstr).str());
+            OERRLOG("Can't connect to %s", ep.getUrlStr(urlstr).str());
             return -1;
         }
         
@@ -252,12 +252,12 @@ int COneServerHttpProxyThread::start()
     catch(IException *excpt)
     {
         StringBuffer errMsg;
-        DBGLOG("%s", excpt->errorMessage(errMsg).str());
+        OERRLOG("%s", excpt->errorMessage(errMsg).str());
         return -1;
     }
     catch(...)
     {
-        DBGLOG("unknown exception");
+        IERRLOG("unknown exception");
         return -1;
     }
 
@@ -466,12 +466,12 @@ int CHttpProxyThread::run()
     catch(IException *excpt)
     {
         StringBuffer errMsg;
-        DBGLOG("%s", excpt->errorMessage(errMsg).str());
+        OERRLOG("%s", excpt->errorMessage(errMsg).str());
         ret = -1;
     }
     catch(...)
     {
-        DBGLOG("unknown exception");
+        IERRLOG("unknown exception");
         ret = -1;
     }
 
@@ -521,14 +521,14 @@ int CHttpProxyThread::readline(ISocket* socket, char* buf, int bufsize, bool& so
         StringBuffer estr;
         if(e->errorCode() != JSOCKERR_graceful_close)
         {
-            DBGLOG("socket(%d) : %s", socket->OShandle(), e->errorMessage(estr).str());
+            OERRLOG("socket(%d) : %s", socket->OShandle(), e->errorMessage(estr).str());
         }
         e->Release();
         socketclosed = true;
     }
     catch(...)
     {
-        DBGLOG("Unknown exception reading from socket(%d).", socket->OShandle());
+        IERRLOG("Unknown exception reading from socket(%d).", socket->OShandle());
         socketclosed = true;
     }
 
@@ -621,11 +621,11 @@ int HttpProxy::start()
         catch(IException *excpt)
         {
             StringBuffer errMsg;
-            DBGLOG("%s", excpt->errorMessage(errMsg).str());
+            OERRLOG("%s", excpt->errorMessage(errMsg).str());
         }
         catch(...)
         {
-            DBGLOG("unknown exception");
+            IERRLOG("unknown exception");
         }
     }
     return 0;
@@ -738,12 +738,12 @@ public:
         catch(IException *excpt)
         {
             StringBuffer errMsg;
-            DBGLOG("%s", excpt->errorMessage(errMsg).str());
+            OERRLOG("%s", excpt->errorMessage(errMsg).str());
             ret = -1;
         }
         catch(...)
         {
-            DBGLOG("unknown exception");
+            IERRLOG("unknown exception");
             ret = -1;
         }
 
@@ -779,11 +779,11 @@ int SocksProxy::start()
         catch(IException *excpt)
         {
             StringBuffer errMsg;
-            DBGLOG("%s", excpt->errorMessage(errMsg).str());
+            OERRLOG("%s", excpt->errorMessage(errMsg).str());
         }
         catch(...)
         {
-            DBGLOG("unknown exception");
+            IERRLOG("unknown exception");
         }
     }
     return 0;

esp/tools/soapplus/msggenerator.cpp

@@ -64,7 +64,7 @@ MessageGenerator::MessageGenerator(const char* path, bool keepfile, SchemaType s
         if (loadFile(cfg, globals->queryProp("cfg")))
             m_cfg.setown(createPTreeFromXMLString(cfg));
         else
-            ERRLOG("Can not load cfg file; ignored");
+            UERRLOG("Can not load cfg file; ignored");
     }
 
     m_logfile = stdout;
@@ -419,7 +419,7 @@ void MessageGenerator::genRoxieMessage(const char* templatemsg, StringBuffer& me
         const char* name = ds->queryProp("@name");
         if (!name)
         {
-            ERRLOG("XmlSchema without name");
+            UERRLOG("XmlSchema without name");
             continue;
         }
         
@@ -429,14 +429,14 @@ void MessageGenerator::genRoxieMessage(const char* templatemsg, StringBuffer& me
         IXmlType* type = xs->queryElementType("Dataset");
         if (!type)
         {
-            ERRLOG("Can not find type '%s'", name);
+            UERRLOG("Can not find type '%s'", name);
             continue;
         }
         // get the Row type
         type = type->queryFieldType(0);
         if (!type)
         {
-            ERRLOG("The root element for %s is not an array", name);
+            UERRLOG("The root element for %s is not an array", name);
             continue;
         }