Skip to content

Commit

Permalink
Merge pull request #18750 from ghalliday/issue32037
Browse files Browse the repository at this point in the history
HPCC-32037 Remove logging lines before log output format is configured

Reviewed-By: Rodrigo Pastrana <[email protected]>
Merged-by: Gavin Halliday <[email protected]>
  • Loading branch information
ghalliday authored Jun 11, 2024
2 parents a3ab459 + 6af9578 commit 4668058
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions system/jlib/jlog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2403,8 +2403,6 @@ void setupContainerizedLogMsgHandler()
if (logConfig->hasProp(logFormatAtt))
{
const char *logFormat = logConfig->queryProp(logFormatAtt);
LOG(MCdebugInfo, "JLog: log format configuration detected '%s'!", logFormat);

bool newFormatDetected = false;
if (streq(logFormat, "xml"))
{
Expand All @@ -2416,9 +2414,7 @@ void setupContainerizedLogMsgHandler()
theStderrHandler = new HandleLogMsgHandlerJSON(stderr, MSGFIELD_STANDARD);
newFormatDetected = true;
}
else if (streq(logFormat, "table"))
LOG(MCdebugInfo, "JLog: default log format detected: '%s'!", logFormat);
else
else if (!streq(logFormat, "table"))
LOG(MCoperatorWarning, "JLog: Invalid log format configuration detected '%s'!", logFormat);

if (newFormatDetected)
Expand Down

0 comments on commit 4668058

Please sign in to comment.