send log data

grouptasks_lang_log_messages.json

@@ -4,7 +4,16 @@
         "languages": [
             {
                 "lang": "en",
-                "message": "%userId% has started group tasks"
+                "message": "%userId% has started group task %groupTaskId% %groupTaskName%"
+            }
+        ]
+    },
+    {
+        "id": 1,
+        "languages": [
+            {
+                "lang": "en",
+                "message": "%userId% has reloaded group tasks config of category %category%"
             }
         ]
     }

modules/logger/logger.go

@@ -114,16 +114,11 @@ func ReadLogs(date string, systemLogs bool) []structs.LogMessageResponse {
 
 		for _, systemLanguageLogMessage := range languageLogMessages {
 			if logMessage.Id == systemLanguageLogMessage.Id {
-				replacedLogMessage := systemLanguageLogMessage.Languages[0].Message
-
-				for _, message := range logMessage.Messages {
-					replacedLogMessage = strings.ReplaceAll(replacedLogMessage, "%"+message.Type+"%", message.Value)
-				}
-
 				logMessages = append(logMessages, structs.LogMessageResponse{
 					Time:    logMessage.Time,
 					Type:    logMessage.Type,
-					Message: replacedLogMessage,
+					Message: systemLanguageLogMessage.Languages[0].Message,
+					LogData: logMessage.Messages,
 				})
 				break
 			}

modules/structs/log.go

@@ -30,4 +30,5 @@ type LogMessageResponse struct {
 	Time    time.Time
 	Type    uint8
 	Message string
+	LogData []LogData
 }

socketserver/hub.go

@@ -93,12 +93,6 @@ func RunHub() {
 				Messages: []structs.LogData{
 					{Type: "userId", Value: user.Id}}})
 
-			logger.AddGroupTasksLog(structs.LogMessage{
-				Id:   0,
-				Type: utils.LogTypeInfo,
-				Messages: []structs.LogData{
-					{Type: "userId", Value: user.Id}}})
-
 		case data := <-broadcast:
 			var receivedMessage structs.ReceivedMessage
 
@@ -156,6 +150,26 @@ func RunHub() {
 					TaskStepId:    "",
 					GlobalInputs:  globalInputsJsonString,
 				})
+
+				logger.AddGroupTasksLog(structs.LogMessage{
+					Id:   0,
+					Type: utils.LogTypeInfo,
+					Messages: []structs.LogData{
+						{
+							Type:  "userId",
+							Value: data.Conn.Locals("userId").(string),
+						},
+						{
+							Type:  "groupTaskId",
+							Value: groupTaskId,
+						},
+						{
+							Type:  "groupTaskName",
+							Value: groupTasks.GroupName,
+						},
+					},
+				})
+
 				break
 			case utils.ReceivedCmdTaskFailedTryAgainRunTaskStep:
 				go grouptasks.RunGroupTask(grouptasks.RunGroupTaskArgs{
@@ -194,6 +208,21 @@ func RunHub() {
 				})
 
 				grouptasks.LoadGroups(category)
+
+				logger.AddGroupTasksLog(structs.LogMessage{
+					Id:   1,
+					Type: utils.LogTypeInfo,
+					Messages: []structs.LogData{
+						{
+							Type:  "userId",
+							Value: data.Conn.Locals("userId").(string),
+						},
+						{
+							Type:  "category",
+							Value: category,
+						},
+					},
+				})
 				break
 			case utils.ReceivedCmdTaskLocking:
 				cache.AddLockedGroupTaskStep(structs.LockedGroupTaskSteps{