lee/backrest
1
0
Fork 0
mirror of https://github.com/garethgeorge/backrest.git synced 2025-12-11 16:25:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: restic outputs add newline separators between log messages
Some checks failed
Build Snapshot Release / build (push) Has been cancelled
Details
Docs / build (push) Has been cancelled
Details
Release Please / release-please (push) Has been cancelled
Details
Test / test-nix (push) Has been cancelled
Details
Test / test-win (push) Has been cancelled
Details
Docs / deploy (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Gareth George
2025-03-14 22:06:55 -07:00
parent 551c08cc6f
commit addf49c1f3
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/restic/outputs.go
View File

@@ -141,6 +141,7 @@ func readBackupProgressEntries(output io.Reader, logger io.Writer, callback func
nonJSONOutput.Write(scanner.Bytes()) nonJSONOutput.Write(scanner.Bytes())
if logger != nil { if logger != nil {
logger.Write(scanner.Bytes()) logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
} }
continue continue
} }
@@ -148,11 +149,13 @@ func readBackupProgressEntries(output io.Reader, logger io.Writer, callback func
nonJSONOutput.Write(scanner.Bytes()) nonJSONOutput.Write(scanner.Bytes())
if logger != nil { if logger != nil {
logger.Write(scanner.Bytes()) logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
} }
continue continue
} }
if event.MessageType == "error" && logger != nil { if event.MessageType == "error" && logger != nil {
logger.Write(scanner.Bytes()) logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
} }
if callback != nil { if callback != nil {
callback(&event) callback(&event)
@@ -160,6 +163,7 @@ func readBackupProgressEntries(output io.Reader, logger io.Writer, callback func
if event.MessageType == "summary" { if event.MessageType == "summary" {
if logger != nil { if logger != nil {
logger.Write(scanner.Bytes()) logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
} }
summary = &event summary = &event
} }
@@ -277,6 +281,7 @@ func readRestoreProgressEntries(output io.Reader, logger io.Writer, callback fun
nonJSONOutput.Write(scanner.Bytes()) nonJSONOutput.Write(scanner.Bytes())
if logger != nil { if logger != nil {
logger.Write(scanner.Bytes()) logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
} }
continue continue
} }
@@ -285,12 +290,14 @@ func readRestoreProgressEntries(output io.Reader, logger io.Writer, callback fun
nonJSONOutput.Write(scanner.Bytes()) nonJSONOutput.Write(scanner.Bytes())
if logger != nil { if logger != nil {
logger.Write(scanner.Bytes()) logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
} }
continue continue
} }
if event.MessageType == "error" && logger != nil { if event.MessageType == "error" && logger != nil {
logger.Write(scanner.Bytes()) logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
} }
if callback != nil { if callback != nil {
callback(&event) callback(&event)
@@ -298,6 +305,7 @@ func readRestoreProgressEntries(output io.Reader, logger io.Writer, callback fun
if event.MessageType == "summary" { if event.MessageType == "summary" {
if logger != nil { if logger != nil {
logger.Write(scanner.Bytes()) logger.Write(scanner.Bytes())
logger.Write([]byte("\n"))
} }
summary = &event summary = &event
} }