Skip to content

Commit d847ffd

Browse files
committed
Merge branch 'develop' into backend/logger-timestamp-hotfix
2 parents d079b8c + 97b6307 commit d847ffd

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

backend/pkg/logger/data/logger.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ func (sublogger *Logger) PushRecord(record abstraction.LoggerRecord) error {
147147
Timestamp: time.Now(),
148148
Inner: err,
149149
}
150+
fmt.Println(writerErr)
150151
}
151152
writer.Flush()
152153
}
@@ -164,18 +165,20 @@ func (sublogger *Logger) Stop() error {
164165
}
165166

166167
closeErr := error(nil)
167-
for _, file := range sublogger.valueFileSlice {
168+
for value, file := range sublogger.valueFileSlice {
168169
err := file.Close()
169170
if err != nil {
170171
closeErr = loggerHandler.ErrClosingFile{
171172
Name: Name,
172173
Timestamp: time.Now(),
173174
}
174175

175-
fmt.Println(closeErr.Error())
176+
fmt.Println(value, ": ", closeErr)
176177
}
177178
}
178179

180+
sublogger.valueFileSlice = make(map[data.ValueName]io.WriteCloser, len(sublogger.valueFileSlice))
181+
179182
fmt.Println("Logger stopped")
180183
return closeErr
181184
}

backend/pkg/logger/logger.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ func (logger *Logger) Start() error {
6161
return nil
6262
}
6363

64+
Timestamp = time.Now()
65+
6466
// Create log folders
6567
for subLogger := range logger.subloggers {
6668
loggerPath := path.Join("logger", string(subLogger), Timestamp.Format(time.RFC3339))

backend/pkg/logger/protection/logger.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ func (sublogger *Logger) Stop() error {
158158
}
159159
}
160160

161+
sublogger.infoIdMap = make(map[abstraction.BoardId]io.WriteCloser, len(sublogger.infoIdMap))
162+
161163
fmt.Println("Logger stopped")
162164
return closeErr
163165
}

0 commit comments

Comments
 (0)