theater/picomap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return error on inner decode failure instead of hanging, split flash-status output

Browse Source
This commit is contained in:
Ian Gulliver
2026-04-12 22:27:21 +09:00
parent 11c101c235
commit cc37b711a4
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/picomap/main.go
View File

@@ -224,15 +224,10 @@ func cmdFlashStatus(args []string) error {
slog.Error("flash-status error", "via", t.name, "err", err) slog.Error("flash-status error", "via", t.name, "err", err)
continue continue
} }
slog.Info("flash-status", log := slog.With("via", t.name)
"via", t.name, log.Info("flash-status", "boot_partition", status.BootPartition)
"boot_partition", status.BootPartition, log.Info("slot-a", "valid", status.SlotA.Valid, "version", status.SlotA.Version, "hash_ok", status.SlotA.HashOK)
"slot_a_valid", status.SlotA.Valid, log.Info("slot-b", "valid", status.SlotB.Valid, "version", status.SlotB.Version, "hash_ok", status.SlotB.HashOK)
"slot_a_version", status.SlotA.Version,
"slot_a_hash_ok", status.SlotA.HashOK,
"slot_b_valid", status.SlotB.Valid,
"slot_b_version", status.SlotB.Version,
"slot_b_hash_ok", status.SlotB.HashOK)
} }
return nil return nil
} }

2
lib/client/client.go
View File

@@ -75,7 +75,7 @@ func roundTrip[T any](c *Client, req any) ([]Response[T], error) {
} }
var inner any var inner any
if err := msgpack.Unmarshal(env.Payload, &inner); err != nil { if err := msgpack.Unmarshal(env.Payload, &inner); err != nil {
continue return nil, fmt.Errorf("decode response: %w", err)
} }
if devErr, ok := inner.(*DeviceError); ok { if devErr, ok := inner.(*DeviceError); ok {
return nil, devErr return nil, devErr