From fd4c81d6e0c62d526190aad76facaedd4ea01548 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 23 Nov 2023 18:42:11 +0000 Subject: [PATCH] HPCC-30912 Ensure configured log detail is used. If no workunit based logging detail was specified, the jlog default level was being used, instead of the configured level. Signed-off-by: Jake Smith --- thorlcr/master/thgraphmanager.cpp | 3 ++- thorlcr/slave/slavmain.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/thorlcr/master/thgraphmanager.cpp b/thorlcr/master/thgraphmanager.cpp index 08d59205dc0..f41ea24278d 100644 --- a/thorlcr/master/thgraphmanager.cpp +++ b/thorlcr/master/thgraphmanager.cpp @@ -852,7 +852,8 @@ void CJobManager::run() addTimeStamp(w, wfid, graphName, StWhenDequeued); } - unsigned maxLogDetail = workunit->getDebugValueInt("maxlogdetail", DefaultDetail); + unsigned defaultConfigLogLevel = getComponentConfigSP()->getPropInt("logging/@detail", DefaultDetail); + unsigned maxLogDetail = workunit->getDebugValueInt("maxlogdetail", defaultConfigLogLevel); ILogMsgFilter *existingLogHandler = queryLogMsgManager()->queryMonitorFilter(logHandler); dbgassertex(existingLogHandler); verifyex(queryLogMsgManager()->changeMonitorFilterOwn(logHandler, getCategoryLogMsgFilter(existingLogHandler->queryAudienceMask(), existingLogHandler->queryClassMask(), maxLogDetail))); diff --git a/thorlcr/slave/slavmain.cpp b/thorlcr/slave/slavmain.cpp index 7ba4bf21838..928ad5e1a86 100644 --- a/thorlcr/slave/slavmain.cpp +++ b/thorlcr/slave/slavmain.cpp @@ -1880,7 +1880,8 @@ class CJobListener : public CSimpleInterface StringBuffer user; workUnitInfo->getProp("user", user); - unsigned maxLogDetail = workUnitInfo->getPropInt("Debug/maxlogdetail", DefaultDetail); + unsigned defaultConfigLogLevel = getComponentConfigSP()->getPropInt("logging/@detail", DefaultDetail); + unsigned maxLogDetail = workUnitInfo->getPropInt("Debug/maxlogdetail", defaultConfigLogLevel); ILogMsgFilter *existingLogHandler = queryLogMsgManager()->queryMonitorFilter(logHandler); dbgassertex(existingLogHandler); verifyex(queryLogMsgManager()->changeMonitorFilterOwn(logHandler, getCategoryLogMsgFilter(existingLogHandler->queryAudienceMask(), existingLogHandler->queryClassMask(), maxLogDetail)));