print logs as string messages

percona · Nov 14, 2024 · f446fd5 · f446fd5
1 parent 3edfcd7
commit f446fd5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/cmd/pbm/diagnostic.go b/cmd/pbm/diagnostic.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/percona/percona-backup-mongodb/pbm/backup"
 	"github.com/percona/percona-backup-mongodb/pbm/errors"
+	"github.com/percona/percona-backup-mongodb/pbm/log"
 	"github.com/percona/percona-backup-mongodb/sdk"
 )
 
@@ -133,16 +134,12 @@ func writeLogToFile(ctx context.Context, pbm *sdk.Client, opts diagnosticOptions
 			return errors.Wrap(err, "log: decode")
 		}
 
-		data, err := bson.MarshalExtJSON(rec, true, true)
-		if err != nil {
-			return errors.Wrap(err, "log: encode")
-		}
-
-		n, err := file.Write(data)
+		s := rec.Stringify(log.AsUTC, true, true)
+		n, err := file.WriteString(s)
 		if err != nil {
 			return errors.Wrap(err, "log: write")
 		}
-		if n != len(data) {
+		if n != len(s) {
 			return errors.Wrap(io.ErrShortWrite, "log")
 		}
 

diff --git a/pbm/log/history.go b/pbm/log/history.go
@@ -58,18 +58,23 @@ func (e *Entry) Stringify(f tsFormatFn, showNode, extr bool) string {
 }
 
 func (e *Entry) String() string {
-	return e.Stringify(tsLocal, false, false)
+	return e.Stringify(AsLocal, false, false)
 }
 
 func (e *Entry) StringNode() string {
-	return e.Stringify(tsLocal, true, false)
+	return e.Stringify(AsLocal, true, false)
 }
 
-func tsLocal(ts int64) string {
+func AsLocal(ts int64) string {
 	//nolint:gosmopolitan
 	return time.Unix(ts, 0).Local().Format(LogTimeFormat)
 }
 
+func AsUTC(ts int64) string {
+	//nolint:gosmopolitan
+	return time.Unix(ts, 0).UTC().Format(LogTimeFormat)
+}
+
 type LogKeys struct {
 	Severity Severity            `bson:"s" json:"s"`
 	RS       string              `bson:"rs" json:"rs"`