lee/backrest
1
0
Fork 0
mirror of https://github.com/garethgeorge/backrest.git synced 2026-08-26 19:07:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: restic outputs add newline separators between log messages

Browse Source
This commit is contained in:
Gareth George
2025-03-14 22:07:02 -07:00
parent a003867fe2
commit 437e8ee3fe
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/restic/outputs.go
+8
View File
@@ -141,6 +141,7 @@ func readBackupProgressEntries(output io.Reader, logger io.Writer, callback func
nonJSONOutput.Write(scanner.Bytes())
if logger != nil {
logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
}
continue
}
@@ -148,11 +149,13 @@ func readBackupProgressEntries(output io.Reader, logger io.Writer, callback func
nonJSONOutput.Write(scanner.Bytes())
if logger != nil {
logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
}
continue
}
if event.MessageType == "error" && logger != nil {
logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
}
if callback != nil {
callback(&event)
@@ -160,6 +163,7 @@ func readBackupProgressEntries(output io.Reader, logger io.Writer, callback func
if event.MessageType == "summary" {
if logger != nil {
logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
}
summary = &event
}
@@ -277,6 +281,7 @@ func readRestoreProgressEntries(output io.Reader, logger io.Writer, callback fun
nonJSONOutput.Write(scanner.Bytes())
if logger != nil {
logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
}
continue
}
@@ -285,12 +290,14 @@ func readRestoreProgressEntries(output io.Reader, logger io.Writer, callback fun
nonJSONOutput.Write(scanner.Bytes())
if logger != nil {
logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
}
continue
}
if event.MessageType == "error" && logger != nil {
logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
}
if callback != nil {
callback(&event)
@@ -298,6 +305,7 @@ func readRestoreProgressEntries(output io.Reader, logger io.Writer, callback fun
if event.MessageType == "summary" {
if logger != nil {
logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
}
summary = &event
}