change log folders

Author: msanlli

.gitignore

@@ -1,4 +1,5 @@
 build
+.vscode
 
 # GOOGLE API KEY
 secret.json

backend/cmd/main.go

@@ -164,8 +164,6 @@ func main() {
 			fmt.Println(packet.Id())
 			switch p := packet.Packet.(type) {
 			case *data.Packet:
-				fmt.Println("DATA REACHED")
-
 				update := updateFactory.NewUpdate(p)
 				dataTransfer.Update(update)
 
@@ -174,17 +172,13 @@ func main() {
 				})
 
 			case *info_packet.Packet:
-				fmt.Println("INFO REACHED")
-
 				messageTransfer.SendMessage(p)
 
 				loggerHandler.PushRecord(&messages_logger.Record{
 					Packet: p,
 				})
 
 			case *protection.Packet:
-				fmt.Println("PROTECTION REACHED")
-
 				messageTransfer.SendMessage(p)
 
 				packet := info_packet.NewPacket(p.Id())
@@ -202,8 +196,6 @@ func main() {
 				}
 
 			case *state.Space:
-				fmt.Println("STATE REACHED")
-
 				loggerHandler.PushRecord(&state_logger.Record{
 					Packet: p,
 				})

backend/pkg/logger/data/logger.go

@@ -25,8 +25,6 @@ type Logger struct {
 	// An atomic boolean is used in order to use CompareAndSwap in the Start and Stop methods
 	running  *atomic.Bool
 	fileLock *sync.RWMutex
-	// initialTime fixes the starting time of the log
-	initialTime time.Time
 	// valueFileSlice is a map that contains the file of each value
 	valueFileSlice map[data.ValueName]io.WriteCloser
 }
@@ -56,7 +54,6 @@ func (sublogger *Logger) Start() error {
 		fmt.Println("Logger already running")
 		return nil
 	}
-	sublogger.initialTime = time.Now()
 
 	fmt.Println("Logger started")
 	return nil
@@ -96,26 +93,22 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 		timestamp := dataRecord.Packet.Timestamp()
 
 		var val string
-		var valType string
 
 		switch v := value.(type) {
 		case numeric:
 			val = strconv.FormatFloat(v.Value(), 'f', -1, 64)
-			valType = "numeric"
 
 		case data.BooleanValue:
 			val = strconv.FormatBool(v.Value())
-			valType = "boolean"
 
 		case data.EnumValue:
 			val = string(v.Variant())
-			valType = "enum"
 		}
 
 		file, ok := sublogger.valueFileSlice[valueName]
 		if !ok {
-			filename := fmt.Sprintf("%s_%s.csv", valueName, dataRecord.Packet.Timestamp().Format(time.RFC3339))
-			f, err := os.Create(path.Join("../pkg/logger/data", valType, filename))
+			filename := fmt.Sprintf("%s_%s.csv", valueName, logger.Timestamp.Format(time.RFC3339))
+			f, err := os.Create(path.Join("logger/data", filename))
 			if err != nil {
 				return &logger.ErrCreatingFile{
 					Name:      Name,

backend/pkg/logger/logger.go

@@ -3,8 +3,11 @@ package logger
 import (
 	"encoding/json"
 	"fmt"
+	"os"
+	"path"
 	"sync"
 	"sync/atomic"
+	"time"
 
 	wsModels "github.com/HyperloopUPV-H8/h9-backend/internal/ws_handle/models"
 	"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
@@ -25,6 +28,8 @@ type Logger struct {
 
 var _ abstraction.Logger = &Logger{}
 
+var Timestamp time.Time = time.Now()
+
 func (Logger) HandlerName() string {
 	return HandlerName
 }
@@ -62,6 +67,11 @@ func (logger *Logger) Start() error {
 		return nil
 	}
 
+	// Create log folders
+	for l := range logger.subloggers {
+		os.MkdirAll(path.Join("logger", fmt.Sprintf("%s_%s", l, time.Now().Format(time.RFC3339))), os.ModePerm)
+	}
+
 	logger.subloggersLock.Lock()
 	defer logger.subloggersLock.Unlock()
 

backend/pkg/logger/messages/logger.go

@@ -23,8 +23,6 @@ type Logger struct {
 	// An atomic boolean is used in order to use CompareAndSwap in the Start and Stop methods
 	running  *atomic.Bool
 	fileLock *sync.RWMutex
-	// initialTime fixes the starting time of the log
-	initialTime time.Time
 	// infoIdMap is a map that contains the file of each info packet
 	infoIdMap map[abstraction.BoardId]io.WriteCloser
 	// BoardNames is a map that contains the common name of each board
@@ -54,7 +52,6 @@ func (sublogger *Logger) Start() error {
 		fmt.Println("Logger already running")
 		return nil
 	}
-	sublogger.initialTime = time.Now()
 
 	fmt.Println("Logger started")
 	return nil
@@ -95,8 +92,9 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 			boardName = fmt.Sprint(boardId)
 		}
 
-		filename := fmt.Sprintf(boardName + "_" + timestamp + ".csv")
-		f, err := os.Create(path.Join("../pkg/logger/messages", filename))
+		filename := path.Join("logger/messages", fmt.Sprintf(boardName+"_"+logger.Timestamp.Format(time.RFC3339)+".csv"))
+		os.MkdirAll(path.Dir(filename), os.ModePerm)
+		f, err := os.Create(filename)
 		if err != nil {
 			return &logger.ErrCreatingFile{
 				Name:      Name,
@@ -109,11 +107,13 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 	}
 	writer := csv.NewWriter(file)
 	defer writer.Flush()
+	defer file.Close()
 
 	err := writer.Write([]string{timestamp, msg})
 	if err != nil {
 		writerErr = err
 	}
+
 	return writerErr
 }
 

backend/pkg/logger/order/logger.go

@@ -23,9 +23,7 @@ type Logger struct {
 	// An atomic boolean is used in order to use CompareAndSwap in the Start and Stop methods
 	running  *atomic.Bool
 	fileLock *sync.RWMutex
-	// initialTime fixes the starting time of the log
-	initialTime time.Time
-	writer      io.WriteCloser
+	writer   io.WriteCloser
 }
 
 type Record struct {
@@ -48,10 +46,10 @@ func (sublogger *Logger) Start() error {
 		fmt.Println("Logger already running")
 		return nil
 	}
-	sublogger.initialTime = time.Now()
 
-	filename := fmt.Sprintf("order_" + sublogger.initialTime.Format(time.RFC3339) + ".csv")
-	file, err := os.Create(path.Join("../pkg/logger/order", filename))
+	filepath := path.Join("logger/order", fmt.Sprint(logger.Timestamp.Format(time.RFC3339)+".csv"))
+	os.MkdirAll(path.Dir(filepath), os.ModePerm)
+	file, err := os.Create(filepath)
 	if err != nil {
 		return &logger.ErrCreatingFile{
 			Name:      Name,
@@ -87,12 +85,14 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 	defer sublogger.fileLock.Unlock()
 
 	csvWriter := csv.NewWriter(sublogger.writer)
+	defer csvWriter.Flush()
+	defer sublogger.writer.Close()
+
 	err := csvWriter.Write([]string{time.Now().Format(time.RFC3339), fmt.Sprint(orderRecord.Packet.GetValues())})
 	if err != nil {
 		return err
 	}
 
-	defer csvWriter.Flush()
 	return nil
 }
 

backend/pkg/logger/state/logger.go

@@ -4,6 +4,7 @@ import (
 	"encoding/csv"
 	"fmt"
 	"os"
+	"path"
 	"sync/atomic"
 	"time"
 
@@ -63,7 +64,9 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 		}
 	}
 
-	file, err := os.Create(fmt.Sprintf("state_" + time.Now().Format(time.RFC3339) + ".csv"))
+	filepath := fmt.Sprint("logger/state/state_" + logger.Timestamp.Format(time.RFC3339) + ".csv")
+	os.MkdirAll(path.Dir(filepath), os.ModePerm)
+	file, err := os.Create(filepath)
 	if err != nil {
 		return &logger.ErrCreatingFile{
 			Name:      Name,