HPCC-22563 Replace legacy audience with appropriate audience

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

common/environment/environment.cpp

@@ -417,7 +417,7 @@ public:
             if (conn == nullptr)
             {
                 if (environmentTraceLevel > 0)
-                    PrintLog("Failed to create locked environment %s", newName.str());
+                    IERRLOG("Failed to create locked environment %s", newName.str());
 
                 throw MakeStringException(-1, "Failed to get a lock on environment /%s", newName.str());
             }
@@ -432,7 +432,7 @@ public:
             if (conn2 == nullptr)
             {
                 if (environmentTraceLevel > 0)
-                    PrintLog("Failed to lock environment %s", constEnv->getPath());
+                    IERRLOG("Failed to lock environment %s", constEnv->getPath());
 
                 throw MakeStringException(-1, "Failed to get a lock on environment /%s", constEnv->getPath());
             }
@@ -529,7 +529,7 @@ void CLockedEnvironment::commit()
         if (conn2 == nullptr)
         {
             if (environmentTraceLevel > 0)
-                PrintLog("Failed to lock environment %s", constEnv->getPath());
+                IERRLOG("Failed to lock environment %s", constEnv->getPath());
 
             throw MakeStringException(-1, "Failed to get a lock on environment /%s", constEnv->getPath());
         }
@@ -566,7 +566,7 @@ void CLockedEnvironment::rollback()
         if (conn2 == nullptr)
         {
             if (environmentTraceLevel > 0)
-                PrintLog("Failed to lock environment %s", constEnv->getPath());
+                IERRLOG("Failed to lock environment %s", constEnv->getPath());
 
             throw MakeStringException(-1, "Failed to get a lock on environment /%s", constEnv->getPath());
         }
@@ -1811,7 +1811,7 @@ bool CLocalEnvironment::getRunInfo(IStringVal & path, IStringVal & dir, const ch
 {
     try
     {
-        // PrintLog("getExecutablePath %s %s %s", tag, version, machineaddr);
+        // DBGLOG("getExecutablePath %s %s %s", tag, version, machineaddr);
 
         // first see if local machine with deployed on
         SocketEndpoint ep(machineaddr);

common/fileview2/fvsource.cpp

@@ -1244,7 +1244,7 @@ IHqlExpression * parseQuery(const char * text)
     for (unsigned i=0; i < errs.errCount(); i++)
     {
         StringBuffer msg;
-        PrintLog("%d %s", errs.item(i)->getLine(), errs.item(i)->errorMessage(msg).str());
+        UERRLOG("%d %s", errs.item(i)->getLine(), errs.item(i)->errorMessage(msg).str());
     }
     return NULL;
 }

common/workunit/workunit.cpp

@@ -3706,7 +3706,7 @@ public:
             catch (IException *E)
             {
                 StringBuffer s;
-                PrintLog("Failed to release write lock on workunit: %s", E->errorMessage(s).str());
+                IERRLOG("Failed to release write lock on workunit: %s", E->errorMessage(s).str());
                 throw;
             }
         }
@@ -3813,7 +3813,7 @@ public:
     ~CLockedWorkUnit()
     {
         if (workUnitTraceLevel > 1)
-            PrintLog("Releasing locked workunit %s", queryWuid());
+            DBGLOG("Releasing locked workunit %s", queryWuid());
         if (c)
             c->unlockRemote();
     }
@@ -4866,10 +4866,10 @@ IWorkUnit* CWorkUnitFactory::createWorkUnit(const char *app, const char *scope,
     strftime(result, sizeof(result), "%Y%m%d-%H%M%S", today);
     wuid.append(result);
     if (workUnitTraceLevel > 1)
-        PrintLog("createWorkUnit created %s", wuid.str());
+        DBGLOG("createWorkUnit created %s", wuid.str());
     IWorkUnit* ret = createNamedWorkUnit(wuid.str(), app, scope, secmgr, secuser);
     if (workUnitTraceLevel > 1)
-        PrintLog("createWorkUnit created %s", ret->queryWuid());
+        DBGLOG("createWorkUnit created %s", ret->queryWuid());
     addTimeStamp(ret, SSTglobal, NULL, StWhenCreated);
     return ret;
 }
@@ -4877,7 +4877,7 @@ IWorkUnit* CWorkUnitFactory::createWorkUnit(const char *app, const char *scope,
 bool CWorkUnitFactory::deleteWorkUnitEx(const char * wuid, bool throwException, ISecManager *secmgr, ISecUser *secuser)
 {
     if (workUnitTraceLevel > 1)
-        PrintLog("deleteWorkUnit %s", wuid);
+        DBGLOG("deleteWorkUnit %s", wuid);
     StringBuffer wuRoot;
     getXPath(wuRoot, wuid);
     Owned<CLocalWorkUnit> cw = _updateWorkUnit(wuid, secmgr, secuser);
@@ -4919,13 +4919,13 @@ IConstWorkUnit* CWorkUnitFactory::openWorkUnit(const char *wuid, ISecManager *se
     if (!wuidStr.length() || ('W' != wuidStr.charAt(0)))
     {
         if (workUnitTraceLevel > 1)
-            PrintLog("openWorkUnit %s invalid WUID", nullText(wuidStr.str()));
+            DBGLOG("openWorkUnit %s invalid WUID", nullText(wuidStr.str()));
 
         return NULL;
     }
 
     if (workUnitTraceLevel > 1)
-        PrintLog("openWorkUnit %s", wuidStr.str());
+        DBGLOG("openWorkUnit %s", wuidStr.str());
     Owned<IConstWorkUnit> wu = _openWorkUnit(wuid, secmgr, secuser);
     if (wu)
     {
@@ -4936,7 +4936,7 @@ IConstWorkUnit* CWorkUnitFactory::openWorkUnit(const char *wuid, ISecManager *se
     else
     {
         if (workUnitTraceLevel > 0)
-            PrintLog("openWorkUnit %s not found", wuidStr.str());
+            IERRLOG("openWorkUnit %s not found", wuidStr.str());
         return NULL;
     }
 }
@@ -4944,7 +4944,7 @@ IConstWorkUnit* CWorkUnitFactory::openWorkUnit(const char *wuid, ISecManager *se
 IWorkUnit* CWorkUnitFactory::updateWorkUnit(const char *wuid, ISecManager *secmgr, ISecUser *secuser)
 {
     if (workUnitTraceLevel > 1)
-        PrintLog("updateWorkUnit %s", wuid);
+        DBGLOG("updateWorkUnit %s", wuid);
     Owned<CLocalWorkUnit> wu = _updateWorkUnit(wuid, secmgr, secuser);
     if (wu)
     {
@@ -4955,7 +4955,7 @@ IWorkUnit* CWorkUnitFactory::updateWorkUnit(const char *wuid, ISecManager *secmg
     else
     {
         if (workUnitTraceLevel > 0)
-            PrintLog("updateWorkUnit %s not found", wuid);
+            IERRLOG("updateWorkUnit %s not found", wuid);
         return NULL;
     }
 }
@@ -5062,7 +5062,7 @@ bool CWorkUnitFactory::restoreWorkUnit(const char *base, const char *wuid, bool
 int CWorkUnitFactory::setTracingLevel(int newLevel)
 {
     if (newLevel)
-        PrintLog("Setting workunit trace level to %d", newLevel);
+        DBGLOG("Setting workunit trace level to %d", newLevel);
     int level = workUnitTraceLevel;
     workUnitTraceLevel = newLevel;
     return level;
@@ -6592,7 +6592,7 @@ IWorkUnit &CLocalWorkUnit::lockRemote(bool commit)
         catch (IException *E)
         {
             StringBuffer s;
-            PrintLog("Failed to get write lock on workunit: %s", E->errorMessage(s).str());
+            IERRLOG("Failed to get write lock on workunit: %s", E->errorMessage(s).str());
             locked.unlock();
             throw;
         }

dali/base/daaudit.hpp

@@ -30,6 +30,4 @@ extern da_decl unsigned queryAuditLogs(const CDateTime &from,const CDateTime &to
 interface IDaliServer;
 extern da_decl IDaliServer *createDaliAuditServer(const char *dir); // called for coven members
 
-constexpr LogMsgCategory daliAuditLogCat(MSGAUD_audit, MSGCLS_information, DefaultDetail);
-
 #endif

dali/datest/datest.cpp

@@ -3309,8 +3309,6 @@ void testMultiConnect()
 }
 
 #if 0
-LogMsgCategory const daliAuditLogCat(MSGAUD_audit, MSGCLS_information, DefaultDetail);
-
 void testDaliLog(bool listener)
 {
     startLogMsgChildReceiver();
@@ -3325,7 +3323,7 @@ void testDaliLog(bool listener)
     }
     else {
         connectLogMsgManagerToDali();
-        LOG(daliAuditLogCat, "W2134");
+        LOG(MCauditInfo, "W2134");
         disconnectLogMsgManagerFromDali();
     }
 }

dali/dfu/dfurun.cpp

@@ -97,7 +97,7 @@ class CDFUengine: public CInterface, implements IDFUengine
                 aln.append(',').append(lfn2);
             }
         }
-        LOG(daliAuditLogCat,"%s",aln.str());
+        LOG(MCauditInfo,"%s",aln.str());
     }
 
 

dali/sasha/saqmon.cpp

@@ -248,7 +248,7 @@ public:
                         unsigned waiting=0;
                         queues.item(qi).getStats(connected,waiting,enqueued);
                         if (moninter==0)
-                            LOG(daliAuditLogCat,",ThorQueueMonitor,%s,%d,%d,%d,%d,%d,%s,%s",qname,wuids.ordinality(),enqueued,waiting,connected,qidlecount[qi],wuids.ordinality()>0?wuids.item(0):"---",wuids.ordinality()>1?wuids.item(1):"---");
+                            LOG(MCauditInfo,",ThorQueueMonitor,%s,%d,%d,%d,%d,%d,%s,%s",qname,wuids.ordinality(),enqueued,waiting,connected,qidlecount[qi],wuids.ordinality()>0?wuids.item(0):"---",wuids.ordinality()>1?wuids.item(1):"---");
                         if (waiting>0) 
                             qidlecount[qi]++;
                         else

ecl/eclagent/eclagent.cpp

@@ -1342,7 +1342,7 @@ char * EclAgent::resolveName(const char *in, char *out, unsigned outlen)
 void EclAgent::logFileAccess(IDistributedFile * file, char const * component, char const * type)
 {
     const char * cluster = clusterNames.item(clusterNames.length()-1);
-    LOG(daliAuditLogCat,
+    LOG(MCauditInfo,
         ",FileAccess,%s,%s,%s,%s,%s,%s,%s",
         component,
         type,

esp/services/ws_dfu/ws_dfuService.cpp

@@ -1332,7 +1332,7 @@ DeleteActionResult doDeleteFile(const char *fn, IUserDescriptor *userdesc, Strin
             }
         }
         fdir.removeEntry(fn, userdesc, NULL, REMOVE_FILE_SDS_CONNECT_TIMEOUT, true);
-        LOG(daliAuditLogCat, "%s,%s", auditStr, fn);
+        LOG(MCauditInfo, "%s,%s", auditStr, fn);
         setDeleteFileResults(lfn, group, false, isSuper ? "Deleted Superfile" : "Deleted File", NULL, returnStr, actionResults);
     }
     catch(IException* e)
@@ -6098,7 +6098,7 @@ void CWsDfuEx::dFUFileAccessCommon(IEspContext &context, const CDfsLogicalFileNa
     }
     resp.setType(kind);
 
-    LOG(daliAuditLogCat,",FileAccess,EspProcess,READ,%s,%s,%s,jobid=%s,expirySecs=%d", cluster.str(), userID.str(), fileName.str(), requestId, expirySecs);
+    LOG(MCauditInfo,",FileAccess,EspProcess,READ,%s,%s,%s,jobid=%s,expirySecs=%d", cluster.str(), userID.str(), fileName.str(), requestId, expirySecs);
 }
 
 // NB: deprecated from ver >= 1.50
@@ -6579,7 +6579,7 @@ bool CWsDfuEx::onDFUFilePublish(IEspContext &context, IEspDFUFilePublishRequest
 
         newFile->rename(newFileName, userDesc);
 
-        LOG(daliAuditLogCat,",FileAccess,EspProcess,CREATED,%s,%s,%s", groupName, userId.str(), newFileName.str());
+        LOG(MCauditInfo,",FileAccess,EspProcess,CREATED,%s,%s,%s", groupName, userId.str(), newFileName.str());
     }
     catch (IException *e)
     {

rtl/eclrtl/eclrtl.cpp

@@ -6397,7 +6397,7 @@ void PrintExtract(StringBuffer & s, const char * tag)
     size32_t outLen;
     char * out = NULL;
     rtlExceptionExtract(outLen, out, s.str(), tag);
-    PrintLog("%s = %.*s", tag, outLen, out);
+    DBGLOG("%s = %.*s", tag, outLen, out);
     rtlFree(out);
 }
 
@@ -6419,7 +6419,7 @@ void testStructuredExceptions()
     PrintExtract(s, "is");
     PrintExtract(s, "location");
     PrintExtract(s, "author");
-    PrintLog("%s", s.str());
+    DBGLOG("%s", s.str());
 }
 
 static void testPackedUnsigned()

system/hrpc/hrpc.cpp

@@ -585,7 +585,7 @@ void HRPCserver::Listen(IHRPCtransport * trans)
 
 #ifdef _DEBUG_MEM
             _CrtMemState start, end, diff;  
-            PrintLog("\n====================== Memory leak check point starts ======================");
+            DBGLOG("\n====================== Memory leak check point starts ======================");
             _CrtMemCheckpoint(&start);
 #endif
 
@@ -596,10 +596,10 @@ void HRPCserver::Listen(IHRPCtransport * trans)
             if (_CrtMemDifference(&diff,&start,&end))
             {
                 fprintf(stderr,"\n*********** Memory leak detected! **********");
-                PrintLog("Memory leak detected!");
+                IERRLOG("Memory leak detected!");
                 _CrtMemDumpStatistics(&diff);
             }
-            PrintLog("\n====================== Memory leak check point ends ========================");
+            DBGLOG("\n====================== Memory leak check point ends ========================");
 #endif
 
             if (state!=server_closed) {
@@ -755,7 +755,7 @@ void HRPCserver::Stop()
             state = server_closed;
     }
     catch (...) {
-        PrintLog("HRPCserver::Stop Fault");
+        IERRLOG("HRPCserver::Stop Fault");
     }
     ::Release(trans);
 }

system/jlib/jexcept.cpp

@@ -302,7 +302,6 @@ const char* serializeMessageAudience(MessageAudience ma)
     case MSGAUD_operator:    ret = "operator";      break;
     case MSGAUD_user:        ret = "user";          break;
     case MSGAUD_programmer:  ret = "programmer";    break;
-    case MSGAUD_legacy:      ret = "legacy";        break;
     case MSGAUD_all:         ret = "all";           break;
     default:                 ret = "unknown";       break;
     }
@@ -320,8 +319,6 @@ MessageAudience deserializeMessageAudience(const char* text)
             ma = MSGAUD_user;
         else if (!strcmp(text, "programmer"))
             ma = MSGAUD_programmer;
-        else if (!strcmp(text, "legacy"))
-            ma = MSGAUD_legacy;
         else if (!strcmp(text, "all"))
             ma = MSGAUD_all;
     }

system/jlib/jlog.hpp

@@ -130,8 +130,6 @@ inline const char * LogMsgAudienceToVarString(LogMsgAudience audience)
         return("User");
     case MSGAUD_programmer:
         return("Programmer");
-    case MSGAUD_legacy:
-        return("Legacy");
     case MSGAUD_audit:
         return("Audit");
     default:
@@ -149,8 +147,6 @@ inline const char * LogMsgAudienceToFixString(LogMsgAudience audience)
         return("User     ");
     case MSGAUD_programmer:
         return("Prog.    ");
-    case MSGAUD_legacy:
-        return("Legacy   ");
     case MSGAUD_audit:
         return("Audit    ");
     default:
@@ -738,14 +734,15 @@ constexpr LogMsgCategory MCauditError(MSGAUD_audit, MSGCLS_error);
 constexpr LogMsgCategory MCuserWarning(MSGAUD_user, MSGCLS_warning);
 constexpr LogMsgCategory MCoperatorWarning(MSGAUD_operator, MSGCLS_warning);
 constexpr LogMsgCategory MCinternalWarning(MSGAUD_programmer, MSGCLS_warning, 1);
+constexpr LogMsgCategory MCauditWarning(MSGAUD_audit, MSGCLS_warning);
 constexpr LogMsgCategory MCuserProgress(MSGAUD_user, MSGCLS_progress);
 constexpr LogMsgCategory MCoperatorProgress(MSGAUD_operator, MSGCLS_progress);
 constexpr LogMsgCategory MCdebugProgress(MSGAUD_programmer, MSGCLS_progress);
 constexpr LogMsgCategory MCuserInfo(MSGAUD_user, MSGCLS_information);
 constexpr LogMsgCategory MCdebugInfo(MSGAUD_programmer, MSGCLS_information);
+constexpr LogMsgCategory MCauditInfo(MSGAUD_audit, MSGCLS_information);
 constexpr LogMsgCategory MCstats(MSGAUD_operator, MSGCLS_progress);
 constexpr LogMsgCategory MCoperatorInfo(MSGAUD_operator, MSGCLS_information);
-constexpr LogMsgCategory MClegacy(MSGAUD_legacy, MSGCLS_legacy, DefaultDetail);
 
 inline LogMsgCategory MCexception(IException * e, LogMsgClass cls = MSGCLS_error) { return LogMsgCategory((e)->errorAudience(),cls); }
 

system/jlib/jmisc.cpp

@@ -219,28 +219,6 @@ jlib_decl void openLogFile(StringBuffer & resolvedFS, const char *filename, unsi
     resolvedFS.set(lf->queryLogFileSpec());
 }
 
-jlib_decl void PrintLogDirect(const char *msg)  // Legacy TODO: remove
-{
-    LOG(MClegacy, unknownJob, "%s", msg);
-}
-
-jlib_decl int PrintLog(const char *fmt, ...)  // Legacy TODO: remove
-{
-    va_list args;
-    va_start(args, fmt);
-    VALOG(MClegacy, unknownJob, fmt, args);
-    va_end(args);
-    return 0;
-}
-
-jlib_decl void SPrintLog(const char *fmt, ...)  // Legacy TODO: remove
-{
-    va_list args;
-    va_start(args, fmt);
-    VALOG(MClegacy, unknownJob, fmt, args);
-    va_end(args);
-}
-
 StringBuffer &addFileTimestamp(StringBuffer &fname, bool daily)
 {
     time_t tNow;

system/jlib/jmisc.hpp

@@ -61,17 +61,7 @@ jlib_decl ILogIntercept* interceptLog(ILogIntercept *intercept); // for custom t
 jlib_decl void openLogFile(StringBuffer & resolvedFS, const char *filename, unsigned detail = 0, bool enterQueueMode = true, bool append = false);
 
 #ifndef DISABLE_PRINTLOG
-jlib_decl void PrintLogDirect(const char *msg);
-jlib_decl int  PrintLog(const char *fmt, ...);
-jlib_decl void SPrintLog(const char *fmt,...); // not terminated by LF
 #define PrintExceptionLog(_e,_txt) EXCLOG(_e, _txt)
-
-#ifdef _DEBUG
-#define PrintLogDebug       PrintLog
-#else
-#define PrintLogDebug       1?0:PrintLog
-#endif
-
 #endif
 
 jlib_decl void PrintMemoryStatusLog();

system/jlib/jmutex.hpp

@@ -66,7 +66,7 @@ public:
     ~Mutex()
     {
         if (owner != 0)
-            printf("Warning - Owned mutex destroyed"); // can't use PrintLog here!
+            printf("Warning - Owned mutex destroyed"); // can't use DBGLOG here!
         CloseHandle(mutex);
     }
     void lock()
@@ -419,7 +419,7 @@ public:
     ~SpinLock()             
     { 
         if (value)
-            printf("Warning - Owned Spinlock destroyed"); // can't use PrintLog here!
+            printf("Warning - Owned Spinlock destroyed"); // can't use DBGLOG here!
     }
 #endif
     inline void enter()       

system/jlib/jscm.hpp

@@ -196,8 +196,7 @@ typedef enum
     //          would not be resolvable by sysadmin or ECL developers. Additional information that may
     //          be useful for improving the platform.
     MSGAUD_programmer  = 0x20,
-    // TODO: to be removed
-    MSGAUD_legacy      = 0x40,
+    // MSGAUD_legacy      = 0x40, REMOVED - may be reused later
     // Target audience: persons involved in accounting and security audits
     MSGAUD_audit       = 0x80,
     // MSGAUD_all is to be used for filtering or specifying which messages are to be logged

system/mp/mpcomm.cpp

@@ -2885,7 +2885,7 @@ public:
     void barrier(void)
     {
 #ifdef _TRACE
-        PrintLog("MP: barrier enter");
+        DBGLOG("MP: barrier enter");
 #endif
 
         /*
@@ -2907,7 +2907,7 @@ public:
             int src = (myrank - mask + numranks) % numranks;
 
 #ifdef _TRACE
-            PrintLog("MP: barrier: send to %d, recv from %d", dst, src);
+            DBGLOG("MP: barrier: send to %d, recv from %d", dst, src);
 #endif
 
             // NOTE: MPI method MUST use sendrecv so as to not send/recv deadlock ...
@@ -2920,7 +2920,7 @@ public:
 
             if (!oks && !okr)
             {
-                PrintLog("MP: barrier: Error sending or recving");
+                DBGLOG("MP: barrier: Error sending or recving");
                 break;
             }
 
@@ -2928,7 +2928,7 @@ public:
         }
 
 #ifdef _TRACE
-        PrintLog("MP: barrier leave");
+        DBGLOG("MP: barrier leave");
 #endif
     }
 

system/security/LdapSecurity/ldapconnection.cpp

@@ -955,7 +955,7 @@ public:
             CLdapConnection* curcon = (CLdapConnection*)&(m_connections.item(x));
             if(curcon != NULL && !curcon->IsShared())
             {
-                //PrintLog("Reusing an LDAP connection");
+                //DBGLOG("Reusing an LDAP connection");
                 if(curcon->validate())
                     return LINK(curcon);
                 else
@@ -963,7 +963,7 @@ public:
             }
         }
 
-        //PrintLog("Creating new connection");
+        //DBGLOG("Creating new connection");
         CLdapConnection* newcon = new CLdapConnection(m_ldapconfig.get());
         if(newcon != NULL)
         {

system/security/zcrypt/mutex.ipp

@@ -45,7 +45,7 @@ public:
     ~ZMutex()
     {
         if (owner != 0)
-            printf("Warning - Owned mutex destroyed"); // can't use PrintLog here!
+            printf("Warning - Owned mutex destroyed"); // can't use DBGLOG here!
         CloseHandle(mutex);
     }
     void lock()

thorlcr/master/thdemonserver.cpp

@@ -88,7 +88,7 @@ private:
         {
             if (memcmp(graphname,"graph",5)==0)
                 graphname+=5;
-            LOG(daliAuditLogCat,",Timing,ThorGraph,%s,%s,%s,%u,1,%d,%s,%s,%s",
+            LOG(MCauditInfo,",Timing,ThorGraph,%s,%s,%s,%u,1,%d,%s,%s,%s",
                 queryServerStatus().queryProperties()->queryProp("@thorname"),
                 wu->queryWuid(),
                 graphname,
@@ -234,7 +234,7 @@ public:
         const char *graphname = graph->queryJob().queryGraphName();
         if (memcmp(graphname,"graph",5)==0)
             graphname+=5;
-        LOG(daliAuditLogCat,",Progress,Thor,StartSubgraph,%s,%s,%s,%u,%s,%s",
+        LOG(MCauditInfo,",Progress,Thor,StartSubgraph,%s,%s,%s,%u,%s,%s",
                 queryServerStatus().queryProperties()->queryProp("@thorname"),
                 graph->queryJob().queryWuid(),
                 graphname,

thorlcr/master/thgraphmanager.cpp

@@ -311,7 +311,7 @@ void CJobManager::fatal(IException *e)
     {
         IERRLOG("Unknown exception in CJobManager::fatal");
     }
-    LOG(daliAuditLogCat,",Progress,Thor,Terminate,%s,%s,%s,exception",
+    LOG(MCauditInfo,",Progress,Thor,Terminate,%s,%s,%s,exception",
             queryServerStatus().queryProperties()->queryProp("@thorname"),
             queryServerStatus().queryProperties()->queryProp("@nodeGroup"),
             queryServerStatus().queryProperties()->queryProp("@queue"));
@@ -708,7 +708,7 @@ bool CJobManager::doit(IConstWorkUnit *workunit, const char *graphName, const So
     StringAttr user(workunit->queryUser());
 
     LOG(MCdebugInfo, thorJob, "Processing wuid=%s, graph=%s from agent: %s", wuid.str(), graphName, agentep.getUrlStr(s).str());
-    LOG(daliAuditLogCat,",Progress,Thor,Start,%s,%s,%s,%s,%s,%s",
+    LOG(MCauditInfo,",Progress,Thor,Start,%s,%s,%s,%s,%s,%s",
             queryServerStatus().queryProperties()->queryProp("@thorname"),
             wuid.str(),
             graphName,
@@ -722,7 +722,7 @@ bool CJobManager::doit(IConstWorkUnit *workunit, const char *graphName, const So
         allDone = executeGraph(*workunit, graphName, agentep);
     }
     catch (IException *_e) { e.setown(_e); }
-    LOG(daliAuditLogCat,",Progress,Thor,Stop,%s,%s,%s,%s,%s,%s",
+    LOG(MCauditInfo,",Progress,Thor,Stop,%s,%s,%s,%s,%s,%s",
             queryServerStatus().queryProperties()->queryProp("@thorname"),
             wuid.str(),
             graphName,

thorlcr/master/thmastermain.cpp

@@ -464,7 +464,7 @@ bool ControlHandler(ahType type)
             if (auditStartLogged)
             {
                 auditStartLogged = false;
-                LOG(daliAuditLogCat,",Progress,Thor,Terminate,%s,%s,%s,ctrlc",
+                LOG(MCauditInfo,",Progress,Thor,Terminate,%s,%s,%s,ctrlc",
                     queryServerStatus().queryProperties()->queryProp("@thorname"),
                     queryServerStatus().queryProperties()->queryProp("@nodeGroup"),
                     queryServerStatus().queryProperties()->queryProp("@queue"));
@@ -821,7 +821,7 @@ int main( int argc, char *argv[]  )
             else
                 PROGLOG("verified mp connection to rest of cluster");
 
-            LOG(daliAuditLogCat, ",Progress,Thor,Startup,%s,%s,%s,%s",nodeGroup.str(),thorname,queueName.str(),logUrl.str());
+            LOG(MCauditInfo, ",Progress,Thor,Startup,%s,%s,%s,%s",nodeGroup.str(),thorname,queueName.str(),logUrl.str());
             auditStartLogged = true;
 
             writeSentinelFile(sentinelFile);
@@ -831,7 +831,7 @@ int main( int argc, char *argv[]  )
                 startPerformanceMonitor(pinterval, PerfMonStandard, nullptr);
 
             thorMain(logHandler);
-            LOG(daliAuditLogCat, ",Progress,Thor,Terminate,%s,%s,%s",thorname,nodeGroup.str(),queueName.str());
+            LOG(MCauditInfo, ",Progress,Thor,Terminate,%s,%s,%s",thorname,nodeGroup.str(),queueName.str());
         }
         else
             PROGLOG("Registration aborted");

thorlcr/mfilemanager/thmfilemanager.cpp

@@ -306,7 +306,7 @@ public:
         ForEachItemIn(i,clusters) {
             outs.append(',').append(clusters.item(i));
         }
-        LOG(daliAuditLogCat,"%s",outs.str());
+        LOG(MCauditInfo,"%s",outs.str());
     }
 
     IDistributedFile *timedLookup(CJobBase &job, CDfsLogicalFileName &lfn, bool write, unsigned timeout=INFINITE)
@@ -452,7 +452,7 @@ public:
                 {
                     ForEachItemIn(c, clusters)
                     {
-                        LOG(daliAuditLogCat,",FileAccess,Thor,DELETED,%s,%s,%s,%s,%s,%" I64F "d,%s",
+                        LOG(MCauditInfo,",FileAccess,Thor,DELETED,%s,%s,%s,%s,%s,%" I64F "d,%s",
                                         globals->queryProp("@name"),
                                         userStr.str(),
                                         logicalName,
@@ -582,7 +582,7 @@ public:
         {
             StringBuffer clusterName;
             fileDesc.getClusterGroupName(c, clusterName, &queryNamedGroupStore());
-            LOG(daliAuditLogCat,",FileAccess,Thor,CREATED,%s,%s,%s,%s,%s,%" I64F "d,%s",
+            LOG(MCauditInfo,",FileAccess,Thor,CREATED,%s,%s,%s,%s,%s,%" I64F "d,%s",
                             globals->queryProp("@nodeGroup"),
                             job.queryUser(),
                             file->queryLogicalName(),