return message in response even without message

main
alex 2023-06-28 17:10:27 +02:00
parent d5b7b59fc0
commit c49cedda6b
1 changed files with 21 additions and 11 deletions

View File

@ -60,6 +60,8 @@ func addLog(logMessage structs.LogMessage, systemLog bool) {
path = groupTasksLogsRootPath
}
log.Debug().Msgf("add log", logMessage)
f, err := os.OpenFile(path+strconv.Itoa(day)+"-"+strconv.Itoa(int(month))+"-"+strconv.Itoa(year)+".json", os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0644)
if err != nil {
@ -113,17 +115,7 @@ func ReadLogs(date string, systemLogs bool) []structs.LogMessageResponse {
languageLogMessages = grouptasksLanguageLogMessages
}
for _, systemLanguageLogMessage := range languageLogMessages {
if logMessage.Id == systemLanguageLogMessage.Id {
logMessages = append(logMessages, structs.LogMessageResponse{
Time: logMessage.Time,
Type: logMessage.Type,
Message: systemLanguageLogMessage.Languages[0].Message,
LogData: logMessage.Messages,
})
break
}
}
logMessages = append(logMessages, getLogMessage(languageLogMessages, logMessage))
}
if err := fileScanner.Err(); err != nil {
@ -134,6 +126,24 @@ func ReadLogs(date string, systemLogs bool) []structs.LogMessageResponse {
return logMessages
}
func getLogMessage(languageLogMessages []structs.LanguageLogMessages, logMessage structs.LogMessage) structs.LogMessageResponse {
logMessageResponse := structs.LogMessageResponse{
Time: logMessage.Time,
Type: logMessage.Type,
LogData: logMessage.Messages,
}
for _, systemLanguageLogMessage := range languageLogMessages {
if logMessage.Id == systemLanguageLogMessage.Id {
logMessageResponse.Message = systemLanguageLogMessage.Languages[0].Message
return logMessageResponse
}
}
return logMessageResponse
}
func GetAllLogMessagesDates(systemLogs bool) []string {
path := systemLogsRootPath