From c49cedda6b65df2f4bdbe8c172cf1921b0b1e66a Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 28 Jun 2023 17:10:27 +0200 Subject: [PATCH] return message in response even without message --- modules/logger/logger.go | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/modules/logger/logger.go b/modules/logger/logger.go index d51305f..baf39a0 100644 --- a/modules/logger/logger.go +++ b/modules/logger/logger.go @@ -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