Merge pull request #14088 from jakesmith/hpcc-24618-loghandler

HPCC-24618 Fix missing logHandler in containerized mode.

Reviewed-By: Xiaoming Wang <xiaoming.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

thorlcr/slave/slavmain.cpp

@@ -1859,12 +1859,12 @@ public:
                         StringBuffer user;
                         workUnitInfo->getProp("user", user);
 
-                        unsigned maxLogDetail = workUnitInfo->getPropInt("Debug/maxLogDetail", DefaultDetail);
+                        unsigned maxLogDetail = workUnitInfo->getPropInt("Debug/maxlogdetail", DefaultDetail);
                         ILogMsgFilter *existingLogHandler = queryLogMsgManager()->queryMonitorFilter(logHandler);
                         dbgassertex(existingLogHandler);
                         verifyex(queryLogMsgManager()->changeMonitorFilterOwn(logHandler, getCategoryLogMsgFilter(existingLogHandler->queryAudienceMask(), existingLogHandler->queryClassMask(), maxLogDetail)));
 
-                        PROGLOG("Started wuid=%s, user=%s, graph=%s\n", wuid.get(), user.str(), graphName.get());
+                        PROGLOG("Started wuid=%s, user=%s, graph=%s [log detail level=%u]\n", wuid.get(), user.str(), graphName.get(), maxLogDetail);
                         PROGLOG("Using query: %s", soPath.str());
 
                         if (!globals->getPropBool("Debug/@slaveDaliClient") && workUnitInfo->getPropBool("Debug/slavedaliclient", false))

thorlcr/slave/thslavemain.cpp

@@ -276,6 +276,7 @@ public:
 
 ILogMsgHandler *startSlaveLog()
 {
+    ILogMsgHandler *logHandler = nullptr;
 #ifndef _CONTAINERIZED
     StringBuffer fileName("thorslave");
     Owned<IComponentLogFileCreator> lf = createComponentLogFileCreator(globals->queryProp("@logDir"), "thor");
@@ -283,7 +284,7 @@ ILogMsgHandler *startSlaveLog()
     lf->setPostfix(slaveNumStr.append(mySlaveNum).str());
     lf->setCreateAliasFile(false);
     lf->setName(fileName.str());//override default filename
-    ILogMsgHandler *logHandler = lf->beginLogging();
+    logHandler = lf->beginLogging();
 #ifndef _DEBUG 
     // keep duplicate logging output to stderr to aide debugging
     queryLogMsgManager()->removeMonitor(queryStderrLogMsgHandler());
@@ -292,6 +293,7 @@ ILogMsgHandler *startSlaveLog()
     LOG(MCdebugProgress, thorJob, "Opened log file %s", lf->queryLogFileSpec());
 #else
     setupContainerizedLogMsgHandler();
+    logHandler = queryStderrLogMsgHandler();
 #endif
     //setupContainerizedStorageLocations();
     LOG(MCdebugProgress, thorJob, "Build %s", BUILD_TAG);