HPCC-21519 THOR - Make sure audience and message class is sensible

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

thorlcr/activities/keyedjoin/thkeyedjoinslave.cpp

@@ -979,7 +979,7 @@ class CKeyedJoinSlave : public CSlaveActivity, implements IJoinProcessor
                         bool removed;
                         msg.read(removed);
                         if (!removed)
-                            WARNLOG("KJ service failed to remove [%u]", closeCmd);
+                            IWARNLOG("KJ service failed to remove [%u]", closeCmd);
                     }
                 }
             }

thorlcr/activities/merge/thmergeslave.cpp

@@ -167,7 +167,7 @@ public:
                         static bool logged=false;
                         if (!logged) {
                             logged = true;
-                            WARNLOG("GlobalMergeSlaveActivity mismatch serialize, deserialize (%u,%u)",sz,mb.length());
+                            IWARNLOG("GlobalMergeSlaveActivity mismatch serialize, deserialize (%u,%u)",sz,mb.length());
                         }
                     }
 #ifdef _FULL_TRACE

thorlcr/activities/msort/thsortu.cpp

@@ -1733,10 +1733,10 @@ public:
     {
         stop(); // if hasn't been already
         if (!reader.join(1000*60))
-            ERRLOG("~CMultiCoreJoinHelper reader join timed out");
+            IERRLOG("~CMultiCoreJoinHelper reader join timed out");
         for (unsigned i=0;i<numworkers;i++) {
             if (!workers[i]->join(1000*60))
-                ERRLOG("~CMultiCoreJoinHelper worker[%d] join timed out",i);
+                IERRLOG("~CMultiCoreJoinHelper worker[%d] join timed out",i);
         }
         for (unsigned i=0;i<numworkers;i++) 
             delete workers[i];
@@ -1980,11 +1980,11 @@ public:
         workqueue.stop();
         multiWriter->abort();
         if (!reader.join(1000*60))
-            ERRLOG("~CMulticoreUnorderedJoinHelper reader join timed out");
+            IERRLOG("~CMulticoreUnorderedJoinHelper reader join timed out");
         for (unsigned i=0;i<numworkers;i++)
         {
             if (!workers[i]->join(1000*60))
-                ERRLOG("~CMulticoreUnorderedJoinHelper worker[%d] join timed out",i);
+                IERRLOG("~CMulticoreUnorderedJoinHelper worker[%d] join timed out",i);
         }
         while (workqueue.ordinality())
             delete workqueue.dequeueNow();

thorlcr/graph/thgraph.cpp

@@ -2724,9 +2724,11 @@ void CJobBase::startJob()
     {
         StringBuffer output;
         if (getAllStacks(output))
-            PrintLogDirect(output);
+        {
+            IERRLOG("%s", output.str());
+        }
         else
-            WARNLOG("Failed to capture process stacks: %s", output.str());
+            IWARNLOG("Failed to capture process stacks: %s", output.str());
     }
 }
 

thorlcr/graph/thgraphmaster.cpp

@@ -692,7 +692,7 @@ public:
                 e.setown(deserializeException(msg));
             sender = sender - 1; // 0 = master
             if (raisedSet->testSet(sender, true) && !aborted)
-                WARNLOG("CBarrierMaster, raise barrier message on tag %d, already received from slave %d", tag, sender);
+                IWARNLOG("CBarrierMaster, raise barrier message on tag %d, already received from slave %d", tag, sender);
             if (aborted) break;
         }
         msg.clear();
@@ -1156,12 +1156,12 @@ public:
         {
             StringBuffer m;
             E->errorMessage(m);
-            DBGLOG("Unable to record exception in workunit: %s", m.str());
+            IERRLOG("Unable to record exception in workunit: %s", m.str());
             E->Release();
         }
         catch (...)
         {
-            DBGLOG("Unable to record exception in workunit: unknown exception");
+            IERRLOG("Unable to record exception in workunit: unknown exception");
         }
     }
     virtual void addWuAssertFailure(unsigned code, const char * text, const char * filename, unsigned lineno, unsigned column, bool isAbort) override
@@ -1177,12 +1177,12 @@ public:
         {
             StringBuffer m;
             E->errorMessage(m);
-            DBGLOG("Unable to record exception in workunit: %s", m.str());
+            IERRLOG("Unable to record exception in workunit: %s", m.str());
             E->Release();
         }
         catch (...)
         {
-            DBGLOG("Unable to record exception in workunit: unknown exception");
+            IERRLOG("Unable to record exception in workunit: unknown exception");
         }
         if (isAbort)
             rtlFailOnAssert();      // minimal implementation

thorlcr/master/mawatchdog.cpp

@@ -167,13 +167,13 @@ unsigned CMasterWatchdogBase::readPacket(HeartBeatPacketHeader &hb, MemoryBuffer
     {
         if (read < sizeof(HeartBeatPacketHeader))
         {
-            WARNLOG("Receive Monitor Packet: wrong size, got %d, less than HeartBeatPacketHeader size", read);
+            IWARNLOG("Receive Monitor Packet: wrong size, got %d, less than HeartBeatPacketHeader size", read);
             return 0;
         }
         memcpy(&hb, mb.readDirect(sizeof(HeartBeatPacketHeader)), sizeof(HeartBeatPacketHeader));
         if (read != hb.packetSize)  // check for corrupt packets
         {
-            WARNLOG("Receive Monitor Packet: wrong size, expected %d, got %d", hb.packetSize, read);
+            IWARNLOG("Receive Monitor Packet: wrong size, expected %d, got %d", hb.packetSize, read);
             return 0;
         }
         mb.setLength(hb.packetSize);

thorlcr/master/thgraphmanager.cpp

@@ -103,7 +103,7 @@ class CJobManager : public CSimpleInterface, implements IJobManager, implements
             catch (IException *E)
             {
                 StringBuffer s;
-                DBGLOG("ERROR: Invalid XML received from %s:%s", E->errorMessage(s).str(), rawText.str());
+                IWARNLOG("processDebugCommand: Invalid XML received from %s:%s", E->errorMessage(s).str(), rawText.str());
                 throw;
             }
 
@@ -187,7 +187,7 @@ class CJobManager : public CSimpleInterface, implements IJobManager, implements
                         DBGLOG("Reading debug command from socket...");
                         if (!ssock.readBlock(rawText, WAIT_FOREVER, NULL, continuationNeeded, isStatus, 1024*1024))
                         {
-                            WARNLOG("No data reading query from socket");
+                            DBGLOG("No data reading query from socket");
                             continue;
                         }
                         assertex(!continuationNeeded);
@@ -309,7 +309,7 @@ void CJobManager::fatal(IException *e)
     }
     catch (...)
     {
-        ERRLOG("Unknown exception in CJobManager::fatal");
+        IERRLOG("Unknown exception in CJobManager::fatal");
     }
     LOG(daliAuditLogCat,",Progress,Thor,Terminate,%s,%s,%s,exception",
             queryServerStatus().queryProperties()->queryProp("@thorname"),
@@ -451,7 +451,7 @@ void CJobManager::run()
     Owned<IMPServer> mpServer = getMPServer();
     Owned<ICommunicator> comm = mpServer->createCommunicator(&queryClusterGroup());
     if (!comm->verifyAll())
-        ERRLOG("Failed to connect to all slaves");
+        OERRLOG("Failed to connect to all slaves");
     else
         PROGLOG("verified mp connection to all slaves");
 
@@ -641,12 +641,12 @@ void CJobManager::run()
             masterEp.serialize(msg);  // only used for tracing
             if (!conversation->send(msg))
             {
-                WARNLOG("send conversation failed");
+                IWARNLOG("send conversation failed");
                 continue;
             }
             if (!conversation->recv(msg.clear(),60*1000))
             {
-                WARNLOG("recv conversation failed");
+                IWARNLOG("recv conversation failed");
                 continue;
             }
             msg.read(graphName);
@@ -811,7 +811,7 @@ void CJobManager::reply(IConstWorkUnit *workunit, const char *wuid, IException *
         replyMb.append((unsigned)DAMP_THOR_REPLY_GOOD);
     if (!conversation->send(replyMb)) {
         s.clear();
-        ERRLOG("Failed to reply to agent %s",agentep.getUrlStr(s).str());
+        IERRLOG("Failed to reply to agent %s",agentep.getUrlStr(s).str());
     }
     conversation.clear();
     handlingConversation = false;

thorlcr/master/thmastermain.cpp

@@ -730,7 +730,7 @@ int main( int argc, char *argv[]  )
         char thorPath[1024];
         if (!GetCurrentDirectory(1024, thorPath))
         {
-            ERRLOG("ThorMaster::main: Current directory path too big, setting it to null");
+            OERRLOG("ThorMaster::main: Current directory path too big, setting it to null");
             thorPath[0] = 0;
         }
         unsigned l = strlen(thorPath);
@@ -817,7 +817,7 @@ int main( int argc, char *argv[]  )
 
             PROGLOG("verifying mp connection to rest of cluster");
             if (!queryNodeComm().verifyAll())
-                ERRLOG("Failed to connect to all nodes");
+                OERRLOG("Failed to connect to all nodes");
             else
                 PROGLOG("verified mp connection to rest of cluster");
 

thorlcr/mfilemanager/thmfilemanager.cpp

@@ -653,7 +653,7 @@ void configureFileDescriptor(const char *logicalName, IFileDescriptor &fileDesc)
         if (props.hasProp("@size"))
         {
             if (noSize)
-                WARNLOG("Some parts of logical file \"%s\" have sizes others do not!", logicalName);
+                IWARNLOG("Some parts of logical file \"%s\" have sizes others do not!", logicalName);
             else
                 offset += props.getPropInt64("@size");
         }

thorlcr/msort/tsortl.cpp

@@ -205,7 +205,7 @@ public:
     ~CSocketRowWriter()
     {
         if (!stopped) {
-            WARNLOG("CSocketRowWriter:: releasing before stopped");
+            IWARNLOG("CSocketRowWriter:: releasing before stopped");
             stop();
         }
     }

thorlcr/msort/tsortm.cpp

@@ -165,8 +165,8 @@ public:
     }
     void stop(const char *title)
     {
-        PrintLog("%8.2f : %s",(double)((double)(msTick()-cstart))/1000,title);
-        PrintLog("--------------------------------------");
+        DBGLOG("%8.2f : %s",(double)((double)(msTick()-cstart))/1000,title);
+        DBGLOG("--------------------------------------");
     }
     unsigned cstart;
 };
@@ -579,7 +579,7 @@ public:
             {
                 CSortNode &slave = slaves.item(i);
                 unsigned slavesamples = averagerecspernode?((unsigned)((averagerecspernode/2+averagesamples*slave.numrecs)/averagerecspernode)):1;
-                //PrintLog("%d samples for %d",slavesamples,i);
+                //DBGLOG("%d samples for %d",slavesamples,i);
                 if (slavesamples)
                 {
                     size32_t samplebufsize;
@@ -697,7 +697,7 @@ public:
             for (unsigned j=0;j<numnodes;j++) {
                 str.appendf("%" RCPF "d, ",splitMap[j+i*numnodes]);
             }
-            PrintLog("%s",str.str());
+            DBGLOG("%s",str.str());
         }
 #endif
 #endif

thorlcr/msort/tsorts.cpp

@@ -215,7 +215,7 @@ public:
                     overflowsize = output->getPosition();
                     if (!overflowed)
                     {
-                        WARNLOG("Sample buffer full");
+                        DBGLOG("Sample buffer full");
                         overflowed = true;
                     }
                 }
@@ -233,7 +233,7 @@ public:
             idxFileIO.clear();
         }
         if (overflowed)
-            WARNLOG("Overflowed by %" I64F "d", overflowsize);
+            IWARNLOG("Overflowed by %" I64F "d", overflowsize);
         ActPrintLog(&activity, "Local Overflow Merge done: overflow file '%s', size = %" I64F "d", dataFile->queryFilename(), dataFile->size());
         return end;
     }
@@ -437,7 +437,7 @@ public:
     }
     IRowStream *sort(CThorExpandingRowArray &localRows, rowcount_t globalTotal, ICompare &iCompare, bool isStable, rowcount_t &rowCount)
     {
-        PrintLog("Minisort started: %s, totalrows=%" RIPF "d", partNo?"seconday node":"primary node", localRows.ordinality());
+        DBGLOG("Minisort started: %s, totalrows=%" RIPF "d", partNo?"seconday node":"primary node", localRows.ordinality());
         size32_t blksize = 0x100000;
 
         // JCSMORE - at the moment, the localsort set is already sorted
@@ -1094,10 +1094,10 @@ public:
         startmergesem.signal();
         ActPrintLog(activity, "StartMiniSort output started");
         traceWait("finishedmergesem(2)",finishedmergesem);
-        PrintLog("StartMiniSort output done");
+        DBGLOG("StartMiniSort output done");
         merger.clear();
         intercept.clear();
-        PrintLog("StartMiniSort exit");
+        DBGLOG("StartMiniSort exit");
     }
     virtual void Close()
     {

thorlcr/msort/tsorts1.cpp

@@ -63,13 +63,13 @@ public:
 #ifdef _TRACE
         char url[100];
         targetep.getUrlStr(url,sizeof(url));
-        PrintLog("SORT Merge READ: Stream(%u) %s, pos=%" RCPF "d len=%" RCPF "u",streamno,url,startrec,numrecs);
+        DBGLOG("SORT Merge READ: Stream(%u) %s, pos=%" RCPF "d len=%" RCPF "u",streamno,url,startrec,numrecs);
 #endif
         SocketEndpoint mergeep = targetep;
         mergeep.port+=SOCKETSERVERINC; 
         stream = ConnectMergeRead(streamno,rowif,mergeep,startrec,numrecs);
 #ifdef _TRACE
-        PrintLog("SORT Merge READ: Stream(%u) connected to %s",streamno,url);
+        DBGLOG("SORT Merge READ: Stream(%u) connected to %s",streamno,url);
 #endif
     }
     virtual ~CMergeReadStream()
@@ -77,7 +77,7 @@ public:
         if (stream) {
             char url[100];
             endpoint.getUrlStr(url,sizeof(url));
-            PrintLog("SORT Merge READ: EOS via destructor for %s",url);
+            DBGLOG("SORT Merge READ: EOS via destructor for %s",url);
             stream->stop();
         }
         eos();
@@ -92,7 +92,7 @@ public:
 #ifdef _FULL_TRACE
             char url[100];
             endpoint.getUrlStr(url,sizeof(url));
-            PrintLog("SORT Merge READ: EOS for %s",url);
+            DBGLOG("SORT Merge READ: EOS for %s",url);
 #endif
             eos();
         }
@@ -105,7 +105,7 @@ public:
 #ifdef _FULL_TRACE
             char url[100];
             endpoint.getUrlStr(url,sizeof(url));
-            PrintLog("SORT Merge READ: stop for %s",url);
+            DBGLOG("SORT Merge READ: stop for %s",url);
 #endif
             stream->stop();
             eos();
@@ -163,7 +163,7 @@ public:
         char name[64];
         int port = socket->peer_name(name,sizeof(name));
         url.append(name).append(':').append(port);
-        PrintLog("SORT Merge WRITE: start %s, pos=%" RCPF "d, len=%" RCPF "d",url.str(),poscount,numrecs);
+        DBGLOG("SORT Merge WRITE: start %s, pos=%" RCPF "d, len=%" RCPF "d",url.str(),poscount,numrecs);
 #endif
         rowcount_t pos=poscount;
         try
@@ -319,7 +319,7 @@ public:
 
     void stop()
     {
-        PrintLog("CSortTransferServerThread::stop");
+        DBGLOG("CSortTransferServerThread::stop");
         term = true;
         try {
             server->cancel_accept();
@@ -328,12 +328,12 @@ public:
             PrintExceptionLog(e,"CSortTransferServerThread:stop");
         }
         verifyex(join(10*60*1000));
-        PrintLog("CSortTransferServerThread::stopped");
+        DBGLOG("CSortTransferServerThread::stopped");
     }
 
     int run() 
     {
-        PrintLog("CSortTransferServerThread started port %d",slave.getTransferPort());
+        DBGLOG("CSortTransferServerThread started port %d",slave.getTransferPort());
         unsigned numretries = 10;
         try {
             while (!term) {
@@ -380,7 +380,7 @@ public:
             e->Release();
         }
         subjoin();
-        PrintLog("CSortTransferServerThread finished");
+        DBGLOG("CSortTransferServerThread finished");
         return 0;
     }
 
@@ -451,9 +451,9 @@ public:
         for (i=0;i<numnodes;i++) {
             char url[100];
             endpoints[i].getUrlStr(url,sizeof(url));
-            PrintLog("  %s",url);
+            DBGLOG("  %s",url);
             for (j=0;j<numnodes;j++) {
-                PrintLog("  %u,",map[k]);
+                DBGLOG("  %u,",map[k]);
                 k++;
             }
         }
@@ -468,7 +468,7 @@ public:
                 respos += vMAPL(j,i)-vMAPL(j,i-1);      // note we are adding up all of the lower as we want start
 
         rowcount_t totalrows = resnum;
-        PrintLog("Output start = %" RCPF "d, num = %" RCPF "u",respos,resnum);
+        DBGLOG("Output start = %" RCPF "d, num = %" RCPF "u",respos,resnum);
 
         IArrayOf<IRowStream> readers;
         IException *exc = NULL;
@@ -483,7 +483,7 @@ public:
                 {
                     if (i==partno)
                     {
-                        PrintLog("SORT Merge READ: Stream(%u) local, pos=%" RCPF "u len=%" RCPF "u",i,sstart,snum);
+                        DBGLOG("SORT Merge READ: Stream(%u) local, pos=%" RCPF "u len=%" RCPF "u",i,sstart,snum);
                         readers.append(*slave.createMergeInputStream(sstart,snum));
                     }
                     else
@@ -529,7 +529,7 @@ void CSortMerge::closedown()
 {
     CriticalBlock block(crit);
 #ifdef _FULL_TRACE
-    PrintLog("SORT Merge: closing %s",url.str());
+    DBGLOG("SORT Merge: closing %s",url.str());
 #endif
     if (!socket)
         return;
@@ -565,7 +565,7 @@ void CSortMerge::closedown()
     }
     started = false;
 #ifdef _TRACE
-    PrintLog("SORT Merge: finished %s, %d rows merged",url.str(),ndone);
+    DBGLOG("SORT Merge: finished %s, %d rows merged",url.str(),ndone);
 #endif
 }
 

thorlcr/slave/slavmain.cpp

@@ -1139,12 +1139,12 @@ class CKJService : public CSimpleInterfaceOf<IKJService>, implements IThreaded,
     {
         if (activeKManagersByHandle.size())
         {
-            WARNLOG("KJService: clearing active %u key manager container(s), that were not closed cleanly", (unsigned)activeKManagersByHandle.size());
+            DBGLOG("KJService: clearing active %u key manager container(s), that were not closed cleanly", (unsigned)activeKManagersByHandle.size());
             activeKManagersByHandle.clear();
         }
         if (activeFetchContextsByHandle.size())
         {
-            WARNLOG("KJService: clearing %u fetch context(s), that were not closed cleanly", (unsigned)activeFetchContextsByHandle.size());
+            DBGLOG("KJService: clearing %u fetch context(s), that were not closed cleanly", (unsigned)activeFetchContextsByHandle.size());
             activeFetchContextsByHandle.clear();
         }
         cachedKMs.clear();
@@ -1485,7 +1485,7 @@ public:
             {
                 if (!queryNodeComm().send(msg, sender, replyTag, LONGTIMEOUT))
                 {
-                    ERRLOG("CKJService: Failed to send error response");
+                    OERRLOG("CKJService: Failed to send error response");
                     break;
                 }
             }
@@ -1681,7 +1681,7 @@ public:
                     Owned<ICommunicator> comm = jobListener.mpServers.item(channel).createCommunicator(&queryClusterGroup());
                     PROGLOG("verifying mp connection to rest of slaves (from channel=%d)", channel);
                     if (!comm->verifyAll())
-                        ERRLOG("Failed to connect to rest of slaves");
+                        OERRLOG("Failed to connect to rest of slaves");
                     else
                         PROGLOG("verified mp connection to rest of slaves");
                 }
@@ -1780,7 +1780,7 @@ public:
                                 OwnedIFile iFile = createIFile(soPath.str());
                                 if (!iFile->exists())
                                 {
-                                    WARNLOG("Slave cached query dll missing: %s, will attempt to fetch from master", soPath.str());
+                                    IWARNLOG("Slave cached query dll missing: %s, will attempt to fetch from master", soPath.str());
                                     copyFile(soPath.str(), remoteSoPath);
                                 }
                                 querySoCache.add(soPath.str());
@@ -1794,7 +1794,7 @@ public:
                         StringBuffer tempSo;
                         if (!rfn.isLocal())
                         {
-                            WARNLOG("Cannot load shared object directly from remote path, creating temporary local copy: %s", soPath.str());
+                            IWARNLOG("Cannot load shared object directly from remote path, creating temporary local copy: %s", soPath.str());
                             GetTempName(tempSo,"so",true);
                             copyFile(tempSo.str(), soPath.str());
                             soPath.clear().append(tempSo.str());
@@ -2124,7 +2124,7 @@ class CFileInProgressHandler : public CSimpleInterface, implements IFileInProgre
         bakName.append((unsigned)dt.getSimple()).append("_").append((unsigned)GetCurrentProcessId()).append(".bak");
         iFileIO.clear(); // close old for rename
         iFile->rename(bakName.str());
-        WARNLOG("Renamed to %s", bakName.str());
+        DBGLOG("Renamed to %s", bakName.str());
         OwnedIFile newIFile = createIFile(origName);
         iFileIO.setown(newIFile->open(IFOreadwrite)); // reopen
     }
@@ -2177,7 +2177,7 @@ public:
         {
             if (sz<=3)
             {
-                WARNLOG("Corrupt files-in-progress file detected: %s", path.str());
+                IWARNLOG("Corrupt files-in-progress file detected: %s", path.str());
                 backup(dir, iFile);
             }
             else
@@ -2189,7 +2189,7 @@ public:
                     const char *eol = strchr(mem, '\n');
                     if (!eol)
                     {
-                        WARNLOG("Corrupt files-in-progress file detected: %s", path.str());
+                        IWARNLOG("Corrupt files-in-progress file detected: %s", path.str());
                         backup(dir, iFile);
                         break;
                     }
@@ -2271,7 +2271,7 @@ void slaveMain(bool &jobListenerStopped)
     HardwareInfo hdwInfo;
     getHardwareInfo(hdwInfo);
     if (hdwInfo.totalMemory < masterMemMB)
-        WARNLOG("Slave has less memory than master node");
+        OWARNLOG("Slave has less memory than master node");
     unsigned gmemSize = globals->getPropInt("@globalMemorySize");
     bool gmemAllowHugePages = globals->getPropBool("@heapUseHugePages", false);
     bool gmemAllowTransparentHugePages = globals->getPropBool("@heapUseTransparentHugePages", true);

thorlcr/slave/slwatchdog.cpp

@@ -204,7 +204,7 @@ public:
         memcpy(&hb, mb.toByteArray(), sizeof(HeartBeatPacketHeader));
         if (hb.packetSize > UDP_DATA_MAX)
         {
-            WARNLOG("Progress packet too big! progress lost");
+            IWARNLOG("Progress packet too big! progress lost");
             hb.progressSize = 0;
             hb.packetSize = sizeof(HeartBeatPacketHeader);
         }

thorlcr/slave/thslavemain.cpp

@@ -152,7 +152,7 @@ static bool RegisterSelf(SocketEndpoint &masterEp)
         {
             StringBuffer errStr("Thor master/slave build mismatch, master = ");
             errStr.append(masterBuildTag).append(", slave = ").append(BUILD_TAG);
-            ERRLOG("%s", errStr.str());
+            OERRLOG("%s", errStr.str());
 #ifndef _DEBUG
             replyError(TE_FailedToRegisterSlave, errStr.str());
             return false;
@@ -173,7 +173,7 @@ static bool RegisterSelf(SocketEndpoint &masterEp)
 
         PROGLOG("verifying mp connection to rest of cluster");
         if (!queryNodeComm().verifyAll())
-            ERRLOG("Failed to connect to all nodes");
+            OERRLOG("Failed to connect to all nodes");
         else
             PROGLOG("verified mp connection to rest of cluster");
         LOG(MCdebugProgress, thorJob, "registered %s",slfStr.str());

thorlcr/thorutil/thbuf.cpp

@@ -1861,7 +1861,7 @@ public:
         streamin->seek(pos,origin);
         if (t!=streamin->tell())  // crc invalid
             if (valid) {
-                WARNLOG("CRCFileStream::seek called - CRC will be invalid");
+                IWARNLOG("CRCFileStream::seek called - CRC will be invalid");
                 valid = false;
             }
     }

thorlcr/thorutil/thmem.cpp

@@ -1178,7 +1178,7 @@ void CThorExpandingRowArray::serialize(IRowSerializerTarget &out)
                 serializer->serialize(out, (const byte *)row);
             else if (warnnull)
             {
-                WARNLOG("CThorExpandingRowArray::serialize ignoring NULL row");
+                IWARNLOG("CThorExpandingRowArray::serialize ignoring NULL row");
                 warnnull = false;
             }
         }
@@ -1236,7 +1236,7 @@ rowidx_t CThorExpandingRowArray::serializeBlock(MemoryBuffer &mb, rowidx_t idx,
             serializer->serialize(out,(const byte *)row);
         else if (warnnull)
         {
-            WARNLOG("CThorExpandingRowArray::serialize ignoring NULL row");
+            IWARNLOG("CThorExpandingRowArray::serialize ignoring NULL row");
             warnnull = false;
         }
         // allows at least one

thorlcr/thorutil/thormisc.cpp

@@ -561,7 +561,7 @@ void SetLogName(const char *prefix, const char *logdir, const char *thorname, bo
     {
         if (!recursiveCreateDirectory(logdir))
         {
-            PrintLog("Failed to use %s as log directory, using current working directory", logdir); // default working directory should be open already
+            OWARNLOG("Failed to use %s as log directory, using current working directory", logdir); // default working directory should be open already
             return;
         }
         logname.append(logdir);
@@ -594,8 +594,8 @@ void SetLogName(const char *prefix, const char *logdir, const char *thorname, bo
     logname.append(".log");
     StringBuffer lf;
     openLogFile(lf, logname.str());
-    PrintLog("Opened log file %s", lf.str());
-    PrintLog("Build %s", BUILD_TAG);
+    PROGLOG("Opened log file %s", lf.str());
+    PROGLOG("Build %s", BUILD_TAG);
 }
 #endif