HPCC-31902 review changes

Signed-off-by: Jake Smith <[email protected]>

thorlcr/master/thgraphmanager.cpp

@@ -1354,8 +1354,7 @@ static void auditThorSystemEventBuilder(std::string &msg, const char *eventName,
     {
         const char *nodeGroup = queryServerStatus().queryProperties()->queryProp("@nodeGroup");
         const char *queueName = queryServerStatus().queryProperties()->queryProp("@queue");
-        const char *logUrl = queryServerStatus().queryProperties()->queryProp("LogFile");
-        msg += std::string(",") + nodeGroup + "," + queueName + "," + logUrl;
+        msg += std::string(",") + nodeGroup + "," + queueName;
     }
 }
 
@@ -1375,15 +1374,8 @@ void auditThorSystemEvent(const char *eventName, std::initializer_list<const cha
 
 void auditThorJobEvent(const char *eventName, const char *wuid, const char *graphName, const char *user)
 {
-    std::string msg = std::string(",Progress,Thor,") + eventName + "," + getComponentConfigSP()->queryProp("@name") + "," + wuid + "," + graphName + "," + nullText(user);
-    if (isContainerized())
-        msg += std::string(",") + k8s::queryMyPodName() + "," + k8s::queryMyContainerName();
-    else
-    {
-        const char *nodeGroup = queryServerStatus().queryProperties()->queryProp("@nodeGroup");
-        const char *queueName = queryServerStatus().queryProperties()->queryProp("@queue");
-        msg += std::string(",") + nodeGroup + "," + queueName + ",";
-    }
+    std::string msg;
+    auditThorSystemEventBuilder(msg, eventName, { wuid, graphName, nullText(user) });
     LOG(MCauditInfo, "%s", msg.c_str());
 }