Skip to content

Commit

Permalink
Return error from zedrouter.init (instead of os.Exit)
Browse files Browse the repository at this point in the history
zedrouter.Run() already calls log.Fatal (with os.Exit inside) when error
is returned from init() or run() methods.

Signed-off-by: Milan Lenco <milan@zededa.com>
  • Loading branch information
milan-zededa committed Mar 19, 2024
1 parent 638828f commit 7aa32d4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/pillar/cmd/zedrouter/zedrouter.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,22 +244,22 @@ func (z *zedrouter) init() (err error) {

z.peUsagePersist, err = persistcache.New(types.PersistCachePatchEnvelopesUsage)
if err != nil {
log.Fatal(err)
return err
}

// restore cached patchEnvelopeUsage counters
for _, key := range z.peUsagePersist.Objects() {
cached, err := z.peUsagePersist.Get(key)
if err != nil {
log.Fatal(err)
return err
}
buf := bytes.NewBuffer(cached)
dec := gob.NewDecoder(buf)

var peUsage types.PatchEnvelopeUsage

if err := dec.Decode(&peUsage); err != nil {
log.Fatal(err)
return err
}

z.patchEnvelopesUsage.Store(key, peUsage)
Expand Down

0 comments on commit 7aa32d4

Please sign in to comment.