Merge pull request #131 from HyperloopUPV-H8/develop

v1.0.2

Author: jmaralo

backend/pkg/logger/data/logger.go

@@ -109,8 +109,8 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 		file, ok := sublogger.valueFileSlice[valueName]
 		if !ok {
 			filename := path.Join(
-				"logger/data",
-				fmt.Sprintf("data_%s", loggerHandler.Timestamp.Format(time.RFC3339)),
+				"logger", "data",
+				loggerHandler.Timestamp.Format(loggerHandler.TimestampFormat),
 				fmt.Sprintf("%s.csv", valueName),
 			)
 			err := os.MkdirAll(path.Dir(filename), os.ModePerm)
@@ -147,6 +147,7 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 				Timestamp: time.Now(),
 				Inner:     err,
 			}
+			fmt.Println(writerErr)
 		}
 		writer.Flush()
 	}
@@ -164,18 +165,20 @@ func (sublogger *Logger) Stop() error {
 	}
 
 	closeErr := error(nil)
-	for _, file := range sublogger.valueFileSlice {
+	for value, file := range sublogger.valueFileSlice {
 		err := file.Close()
 		if err != nil {
 			closeErr = loggerHandler.ErrClosingFile{
 				Name:      Name,
 				Timestamp: time.Now(),
 			}
 
-			fmt.Println(closeErr.Error())
+			fmt.Println(value, ": ", closeErr)
 		}
 	}
 
+	sublogger.valueFileSlice = make(map[data.ValueName]io.WriteCloser, len(sublogger.valueFileSlice))
+
 	fmt.Println("Logger stopped")
 	return closeErr
 }

backend/pkg/logger/logger.go

@@ -1,8 +1,6 @@
 package logger
 
 import (
-	"os"
-	"path"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -16,6 +14,8 @@ const (
 	HandlerName = "logger"
 )
 
+const TimestampFormat = "01-Jan-2006_15-04-05.000"
+
 // Logger is a struct that implements the abstraction.Logger interface
 type Logger struct {
 	// An atomic boolean is used in order to use CompareAndSwap in the Start and Stop methods
@@ -61,20 +61,7 @@ func (logger *Logger) Start() error {
 		return nil
 	}
 
-	// Create log folders
-	for subLogger := range logger.subloggers {
-		loggerPath := path.Join("logger", string(subLogger), Timestamp.Format(time.RFC3339))
-		logger.trace.Debug().Str("subLogger", string(subLogger)).Str("path", loggerPath).Msg("creating folder")
-		err := os.MkdirAll(loggerPath, os.ModePerm)
-		if err != nil {
-			logger.trace.Error().Stack().Err(err).Msg("creating folder")
-			return ErrCreatingAllDir{
-				Name:      Name,
-				Timestamp: time.Now(),
-				Path:      loggerPath,
-			}
-		}
-	}
+	Timestamp = time.Now()
 
 	logger.subloggersLock.Lock()
 	defer logger.subloggersLock.Unlock()

backend/pkg/logger/order/logger.go

@@ -52,8 +52,8 @@ func (sublogger *Logger) Start() error {
 	}
 
 	filename := path.Join(
-		"logger/order",
-		fmt.Sprintf("order_%s", logger.Timestamp.Format(time.RFC3339)),
+		"logger", "order",
+		logger.Timestamp.Format(logger.TimestampFormat),
 		"order.csv",
 	)
 	err := os.MkdirAll(path.Dir(filename), os.ModePerm)

backend/pkg/logger/protection/logger.go

@@ -91,8 +91,8 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 		}
 
 		filename := path.Join(
-			"logger/protections",
-			fmt.Sprintf("protections_%s", logger.Timestamp.Format(time.RFC3339)),
+			"logger", "protections",
+			logger.Timestamp.Format(logger.TimestampFormat),
 			fmt.Sprintf("%s.csv", boardName),
 		)
 		err := os.MkdirAll(path.Dir(filename), os.ModePerm)
@@ -158,6 +158,8 @@ func (sublogger *Logger) Stop() error {
 		}
 	}
 
+	sublogger.infoIdMap = make(map[abstraction.BoardId]io.WriteCloser, len(sublogger.infoIdMap))
+
 	fmt.Println("Logger stopped")
 	return closeErr
 }

backend/pkg/logger/state/logger.go

@@ -68,9 +68,9 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
 	}
 
 	filename := path.Join(
-		"logger/state",
-		fmt.Sprintf("state_%s", logger.Timestamp.Format(time.RFC3339)),
-		fmt.Sprintf("state_%s.csv", time.Now().Format(time.RFC3339)),
+		"logger", "state",
+		logger.Timestamp.Format(logger.TimestampFormat),
+		fmt.Sprintf("%s.csv", time.Now().Format(logger.TimestampFormat)),
 	)
 	err := os.MkdirAll(path.Dir(filename), os.ModePerm)
 	if err != nil {