particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

store: don't log if no logger was passed

Browse source 
`log` is `nil`, unless we are in verbose mode. Skip logging if no logger
was passed.

Long-term I think we should reconsider how we do our logging, and always
log these type of unexpected errors, and hence always have the logger be
non-nil. For now, fix the immediate problem.

The fact that loading the store from disk fails on upgrade is
unexpected, and should be fixed separately.

Fixes #685.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2020-05-29 12:49:25 +02:00
parent 76c18566fc
commit 71b69e5ad2
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/store/store.go
View file

@ -75,7 +75,7 @@ func New(stateDir *string, arch distro.Arch, log *log.Logger) *Store {
if stateDir != nil { if stateDir != nil {
db = jsondb.New(*stateDir, 0600) db = jsondb.New(*stateDir, 0600)
_, err := db.Read(StoreDBName, &storeStruct) _, err := db.Read(StoreDBName, &storeStruct)
if err != nil { if err != nil && log != nil {
log.Fatalf("cannot read state: %v", err) log.Fatalf("cannot read state: %v", err)
} }
} }