stakey/vspd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

db.Close() if an error occurs in db.Open().

Browse Source
This commit is contained in:
jholdstock 2022-05-16 14:11:07 +01:00 committed by Jamie Holdstock
parent ebadf8eefc
commit 1db99bfddf
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
database/database.go
View File

@ -192,6 +192,10 @@ func Open(shutdownCtx context.Context, shutdownWg *sync.WaitGroup, dbFile string
dbVersion, err := vdb.Version() dbVersion, err := vdb.Version()
if err != nil { if err != nil {
closeErr := vdb.db.Close()
if closeErr != nil {
log.Errorf("Error closing database: %v", closeErr)
}
return nil, fmt.Errorf("unable to get db version: %w", err) return nil, fmt.Errorf("unable to get db version: %w", err)
} }
@ -199,6 +203,10 @@ func Open(shutdownCtx context.Context, shutdownWg *sync.WaitGroup, dbFile string
err = vdb.Upgrade(dbVersion) err = vdb.Upgrade(dbVersion)
if err != nil { if err != nil {
closeErr := vdb.db.Close()
if closeErr != nil {
log.Errorf("Error closing database: %v", closeErr)
}
return nil, fmt.Errorf("upgrade failed: %w", err) return nil, fmt.Errorf("upgrade failed: %w", err)
} }