HPCC-33885

Signed-off-by: Dave Streeter <[email protected]>

Author: streeterd

system/jlib/jlog.cpp

@@ -2377,13 +2377,6 @@ static constexpr unsigned queueLenDefault = 512;
 static constexpr unsigned queueDropDefault = 0; // disabled by default
 static constexpr bool useSysLogDefault = false;
 
-static Singleton<bool> firstUpdateConfigHookCall;
-static bool firstUpdateConfigHookCallValue{true};
-bool queryFirstUpdateConfigHookCall()
-{
-    return *firstUpdateConfigHookCall.query([] () { return &firstUpdateConfigHookCallValue; });
-}
-
 struct LogFormatChangedDetails
 {
     StringBuffer logFormat{""};
@@ -2399,7 +2392,7 @@ LogFormatChangedDetails hasLogFormatChanged(const Owned<IPropertyTree> &logConfi
         StringAttr logConfigFormat(logConfig->queryProp(logFormatAtt));
         UWARNLOG("DJPS hasLogFormatChanged() logConfigFormat=%s", logConfigFormat.str());
         logFormatChanged.logFormat.set(logConfigFormat.str());
-        if (streq(logConfigFormat,"xml"))
+        if (streq(logConfigFormat, "xml"))
         {
             UWARNLOG("DJPS hasLogFormatChanged() xml");
             if (theStderrHandler->queryFormatType() != LOGFORMAT_xml)
@@ -2408,7 +2401,7 @@ LogFormatChangedDetails hasLogFormatChanged(const Owned<IPropertyTree> &logConfi
                 logFormatChanged.formatChangeDetected = true;
             }
         }
-        else if (streq(logConfigFormat,"json"))
+        else if (streq(logConfigFormat, "json"))
         {
             UWARNLOG("DJPS hasLogFormatChanged() json");
             if (theStderrHandler->queryFormatType() != LOGFORMAT_json)
@@ -2417,7 +2410,7 @@ LogFormatChangedDetails hasLogFormatChanged(const Owned<IPropertyTree> &logConfi
                 logFormatChanged.formatChangeDetected = true;
             }
         }
-        else if (streq(logConfigFormat,"table"))
+        else if (streq(logConfigFormat, "table"))
         {
             UWARNLOG("DJPS hasLogFormatChanged() table");
             if (theStderrHandler->queryFormatType() != LOGFORMAT_table)
@@ -2456,13 +2449,13 @@ bool configureHandlers(bool rejectOnTheFlyChanges)
 
         if (logConfig->hasProp(logFieldsAtt))
         {
-            //Supported logging fields: TRC,SPN,AUD,CLS,DET,MID,TIM,DAT,PID,TID,NOD,JOB,USE,SES,COD,MLT,MCT,NNT,COM,QUO,PFX,ALL,STD
+            // Supported logging fields: TRC,SPN,AUD,CLS,DET,MID,TIM,DAT,PID,TID,NOD,JOB,USE,SES,COD,MLT,MCT,NNT,COM,QUO,PFX,ALL,STD
             const char *logFields = logConfig->queryProp(logFieldsAtt);
             if (!isEmptyString(logFields))
                 theStderrHandler->setMessageFields(logMsgFieldsFromAbbrevs(logFields));
         }
 
-        //Only recreate filter if at least one filter attribute configured
+        // Only recreate filter if at least one filter attribute configured
         if (logConfig->hasProp(logMsgDetailAtt) || logConfig->hasProp(logMsgAudiencesAtt) || logConfig->hasProp(logMsgClassesAtt))
         {
             LogMsgDetail logDetail = logConfig->getPropInt(logMsgDetailAtt, DefaultDetail);
@@ -2500,7 +2493,7 @@ void setupContainerizedLogMsgHandler()
     UWARNLOG("DJPS setupContainerizedLogMsgHandler() called");
     configUpdateHook.installOnce(updateConfigFunc, false);
 
-    if (!configureHandlers(false))  // false return means that logging is disabled
+    if (!configureHandlers(false)) // false return means that logging is disabled
     {
         UWARNLOG("DJPS !configureHandlers(false)");
         return;