From 1db99bfddfb1bfc53fd8fbfe839dfb2b037ce126 Mon Sep 17 00:00:00 2001 From: jholdstock Date: Mon, 16 May 2022 14:11:07 +0100 Subject: [PATCH] db.Close() if an error occurs in db.Open(). --- database/database.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/database/database.go b/database/database.go index 0881809..6c1e9e0 100644 --- a/database/database.go +++ b/database/database.go @@ -192,6 +192,10 @@ func Open(shutdownCtx context.Context, shutdownWg *sync.WaitGroup, dbFile string dbVersion, err := vdb.Version() 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) } @@ -199,6 +203,10 @@ func Open(shutdownCtx context.Context, shutdownWg *sync.WaitGroup, dbFile string err = vdb.Upgrade(dbVersion) 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) }