From 437e8ee3fe8a9f3a88704dfc7ca2b183e049440d Mon Sep 17 00:00:00 2001 From: Gareth George Date: Fri, 14 Mar 2025 22:06:55 -0700 Subject: [PATCH] fix: restic outputs add newline separators between log messages --- pkg/restic/outputs.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkg/restic/outputs.go b/pkg/restic/outputs.go index d3bc55f8..723505dd 100644 --- a/pkg/restic/outputs.go +++ b/pkg/restic/outputs.go @@ -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 }