alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

backup: show actual error strings in --json mode

Browse source 
Previously, an error JSON fragment would look like:
{"message_type": "error", "error": {}}

This is because encoding/json cannot marshal an error interface.
Instead, we now call .Error() to get the string value.
This commit is contained in:
Michael Terry 2024-07-27 19:04:34 -04:00
parent f4bdfea1c9
commit ad2585af67
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/ui/backup/json.go
View file

@ -68,7 +68,7 @@ func (b *JSONProgress) Update(total, processed Counter, errors uint, currentFile
func (b *JSONProgress) ScannerError(item string, err error) error { func (b *JSONProgress) ScannerError(item string, err error) error {
b.error(errorUpdate{ b.error(errorUpdate{
MessageType: "error", MessageType: "error",
Error: err, Error: err.Error(),
During: "scan", During: "scan",
Item: item, Item: item,
}) })
@ -79,7 +79,7 @@ func (b *JSONProgress) ScannerError(item string, err error) error {
func (b *JSONProgress) Error(item string, err error) error { func (b *JSONProgress) Error(item string, err error) error {
b.error(errorUpdate{ b.error(errorUpdate{
MessageType: "error", MessageType: "error",
Error: err, Error: err.Error(),
During: "archival", During: "archival",
Item: item, Item: item,
}) })
@ -208,7 +208,7 @@ type statusUpdate struct {
type errorUpdate struct { type errorUpdate struct {
MessageType string `json:"message_type"` // "error" MessageType string `json:"message_type"` // "error"
Error error `json:"error"` Error string `json:"error"`
During string `json:"during"` During string `json:"during"`
Item string `json:"item"` Item string `json:"item"`
} }