HPCC-33885 WIP

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

Author: streeterd

system/jlib/jlog.cpp

@@ -2391,26 +2391,40 @@ struct LogFormatChangedDetails
 };
 LogFormatChangedDetails hasLogFormatChanged(const Owned<IPropertyTree> &logConfig)
 {
+    UWARNLOG("DJPS hasLogFormatChanged() called");
     LogFormatChangedDetails logFormatChanged{};
 
     if (logConfig->hasProp(logFormatAtt))
     {
-        String logConfigFormat = logConfig->queryProp(logFormatAtt);
+        StringAttr logConfigFormat(logConfig->queryProp(logFormatAtt));
+        UWARNLOG("DJPS hasLogFormatChanged() logConfigFormat=%s", logConfigFormat.str());
         logFormatChanged.logFormat.set(logConfigFormat.str());
-        if (logConfigFormat.compareTo("xml") == 0)
+        if (streq(logConfigFormat,"xml"))
         {
+            UWARNLOG("DJPS hasLogFormatChanged() xml");
             if (theStderrHandler->queryFormatType() != LOGFORMAT_xml)
+            {
+                UWARNLOG("DJPS hasLogFormatChanged() logFormatChanged.formatChangeDetected = true");
                 logFormatChanged.formatChangeDetected = true;
+            }
         }
-        else if (logConfigFormat.compareTo("json") == 0)
+        else if (streq(logConfigFormat,"json"))
         {
+            UWARNLOG("DJPS hasLogFormatChanged() json");
             if (theStderrHandler->queryFormatType() != LOGFORMAT_json)
+            {
+                UWARNLOG("DJPS hasLogFormatChanged() logFormatChanged.formatChangeDetected = true");
                 logFormatChanged.formatChangeDetected = true;
+            }
         }
-        else if (logConfigFormat.compareTo("table") == 0)
+        else if (streq(logConfigFormat,"table"))
         {
+            UWARNLOG("DJPS hasLogFormatChanged() table");
             if (theStderrHandler->queryFormatType() != LOGFORMAT_table)
+            {
+                UWARNLOG("DJPS hasLogFormatChanged() logFormatChanged.formatChangeDetected = true");
                 logFormatChanged.formatChangeDetected = true;
+            }
         }
         else
             LOG(MCoperatorWarning, "JLog: Invalid log format configuration detected '%s'!", logConfigFormat.str());
@@ -2421,18 +2435,24 @@ LogFormatChangedDetails hasLogFormatChanged(const Owned<IPropertyTree> &logConfi
 
 bool configureHandlers(bool rejectOnTheFlyChanges)
 {
+    UWARNLOG("DJPS configureHandlers(%s)", boolToStr(rejectOnTheFlyChanges));
     Owned<IPropertyTree> logConfig = getComponentConfigSP()->getPropTree("logging");
     if (logConfig)
     {
         if (logConfig->getPropBool(logDisabledAtt, false))
         {
             removeLog();
+            UWARNLOG("DJPS logging disabled");
             return false;
         }
 
-        LogFormatChangedDetails logFormatChanged = hasLogFormatChanged(logConfig);
-        if (rejectOnTheFlyChanges && logFormatChanged.formatChangeDetected)
-            UWARNLOG("JLog: Ignoring log format configuration change on the fly is not supported in a containerized environment");
+        if (rejectOnTheFlyChanges)
+        {
+            UWARNLOG("DJPS checking logformat change");
+            LogFormatChangedDetails logFormatChanged = hasLogFormatChanged(logConfig);
+            if (logFormatChanged.formatChangeDetected)
+                UWARNLOG("JLog: Ignoring log format configuration change on the fly is not supported in a containerized environment");
+        }
 
         if (logConfig->hasProp(logFieldsAtt))
         {
@@ -2477,10 +2497,14 @@ auto updateConfigFunc = [](const IPropertyTree *oldComponentConfiguration, const
 static CConfigUpdateHook configUpdateHook;
 void setupContainerizedLogMsgHandler()
 {
+    UWARNLOG("DJPS setupContainerizedLogMsgHandler() called");
     configUpdateHook.installOnce(updateConfigFunc, false);
 
     if (!configureHandlers(false))  // false return means that logging is disabled
+    {
+        UWARNLOG("DJPS !configureHandlers(false)");
         return;
+    }
 
     Owned<IPropertyTree> logConfig = getComponentConfigSP()->getPropTree("logging");
     if (logConfig)
@@ -2491,24 +2515,30 @@ void setupContainerizedLogMsgHandler()
             bool newFormatDetected = false;
             if (streq(logFormatChanged.logFormat.str(), "xml"))
             {
+                UWARNLOG("DJPS existing log format is xml");
                 if (theStderrHandler->queryFormatType() != LOGFORMAT_xml)
                 {
+                    UWARNLOG("DJPS set newFormatDetected = true");
                     newFormatDetected = true;
                     theStderrHandler = new HandleLogMsgHandlerXML(stderr, MSGFIELD_STANDARD);
                 }
             }
             else if (streq(logFormatChanged.logFormat.str(), "json"))
             {
+                UWARNLOG("DJPS existing log format is json");
                 if (theStderrHandler->queryFormatType() != LOGFORMAT_json)
                 {
+                    UWARNLOG("DJPS set newFormatDetected = true");
                     newFormatDetected = true;
                     theStderrHandler = new HandleLogMsgHandlerJSON(stderr, MSGFIELD_STANDARD);
                 }
             }
             else if (streq(logFormatChanged.logFormat.str(), "table"))
             {
+                UWARNLOG("DJPS existing log format is table");
                 if (theStderrHandler->queryFormatType() != LOGFORMAT_table)
                 {
+                    UWARNLOG("DJPS set newFormatDetected = true");
                     newFormatDetected = true;
                     theStderrHandler = new HandleLogMsgHandlerTable(stderr, MSGFIELD_STANDARD);
                 }
@@ -2517,7 +2547,10 @@ void setupContainerizedLogMsgHandler()
                 LOG(MCoperatorWarning, "JLog: Invalid log format configuration detected '%s'!", logFormatChanged.logFormat.str());
 
             if (newFormatDetected)
+            {
+                UWARNLOG("DJPS processing newFormatDetected = true");
                 theManager->resetMonitors();
+            }
         }
 
         unsigned queueLen = logConfig->getPropInt(logQueueLenAtt, queueLenDefault);