Skip to content

Commit a8f57ed

Browse files
committed
fix directory creation
1 parent be04803 commit a8f57ed

5 files changed

Lines changed: 27 additions & 19 deletions

File tree

backend/pkg/logger/data/logger.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,10 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
107107

108108
file, ok := sublogger.valueFileSlice[valueName]
109109
if !ok {
110-
filename := fmt.Sprintf("%s_%s.csv", valueName, logger.Timestamp.Format(time.RFC3339))
111-
f, err := os.Create(path.Join("logger/data", filename))
110+
filename := path.Join("logger/data", fmt.Sprintf("data_%s", logger.Timestamp.Format(time.RFC3339)), fmt.Sprintf("%s.csv", valueName))
111+
os.MkdirAll(path.Dir(filename), os.ModePerm)
112+
113+
f, err := os.Create(path.Join(filename))
112114
if err != nil {
113115
return &logger.ErrCreatingFile{
114116
Name: Name,

backend/pkg/logger/logger.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ func (logger *Logger) Start() error {
6868
}
6969

7070
// Create log folders
71-
for l := range logger.subloggers {
72-
os.MkdirAll(path.Join("logger", fmt.Sprintf("%s_%s", l, time.Now().Format(time.RFC3339))), os.ModePerm)
71+
for logger := range logger.subloggers {
72+
os.MkdirAll(path.Join("logger", fmt.Sprint(logger), fmt.Sprintf("%s_%s", logger, Timestamp.Format(time.RFC3339))), os.ModePerm)
7373
}
7474

7575
logger.subloggersLock.Lock()

backend/pkg/logger/messages/logger.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
9292
boardName = fmt.Sprint(boardId)
9393
}
9494

95-
filename := path.Join("logger/messages", fmt.Sprintf(boardName+"_"+logger.Timestamp.Format(time.RFC3339)+".csv"))
95+
filename := path.Join("logger/messages", fmt.Sprintf("messages_%s", logger.Timestamp.Format(time.RFC3339)), fmt.Sprintf("%s.csv", boardName))
9696
os.MkdirAll(path.Dir(filename), os.ModePerm)
97+
9798
f, err := os.Create(filename)
9899
if err != nil {
99100
return &logger.ErrCreatingFile{

backend/pkg/logger/order/logger.go

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func NewLogger() *Logger {
3838
return &Logger{
3939
running: &atomic.Bool{},
4040
fileLock: &sync.RWMutex{},
41+
writer: nil,
4142
}
4243
}
4344

@@ -47,18 +48,6 @@ func (sublogger *Logger) Start() error {
4748
return nil
4849
}
4950

50-
filepath := path.Join("logger/order", fmt.Sprint(logger.Timestamp.Format(time.RFC3339)+".csv"))
51-
os.MkdirAll(path.Dir(filepath), os.ModePerm)
52-
file, err := os.Create(filepath)
53-
if err != nil {
54-
return &logger.ErrCreatingFile{
55-
Name: Name,
56-
Timestamp: time.Now(),
57-
Inner: err,
58-
}
59-
}
60-
sublogger.writer = file
61-
6251
fmt.Println("Logger started")
6352
return nil
6453
}
@@ -84,10 +73,25 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
8473
sublogger.fileLock.Lock()
8574
defer sublogger.fileLock.Unlock()
8675

76+
if sublogger.writer == nil {
77+
filename := path.Join("logger/order", fmt.Sprintf("order_%s", logger.Timestamp.Format(time.RFC3339)), "order.csv")
78+
os.MkdirAll(path.Dir(filename), os.ModePerm)
79+
80+
file, err := os.Create(filename)
81+
if err != nil {
82+
return &logger.ErrCreatingFile{
83+
Name: Name,
84+
Timestamp: time.Now(),
85+
Inner: err,
86+
}
87+
}
88+
sublogger.writer = file
89+
}
90+
8791
csvWriter := csv.NewWriter(sublogger.writer)
8892
defer csvWriter.Flush()
8993

90-
err := csvWriter.Write([]string{time.Now().Format(time.RFC3339), fmt.Sprint(orderRecord.Packet.GetValues())})
94+
err := csvWriter.Write([]string{orderRecord.Packet.Timestamp().Format(time.RFC3339), fmt.Sprint(orderRecord.Packet.GetValues())})
9195
if err != nil {
9296
return err
9397
}

backend/pkg/logger/state/logger.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,9 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
6464
}
6565
}
6666

67-
filepath := fmt.Sprint("logger/state/state_" + logger.Timestamp.Format(time.RFC3339) + ".csv")
67+
filepath := path.Join("logger/state", fmt.Sprintf("state_%s", logger.Timestamp.Format(time.RFC3339)), fmt.Sprintf("state_%s.csv", time.Now().Format(time.RFC3339)))
6868
os.MkdirAll(path.Dir(filepath), os.ModePerm)
69+
6970
file, err := os.Create(filepath)
7071
if err != nil {
7172
return &logger.ErrCreatingFile{

0 commit comments

Comments
 (0)