Fix ReadOnlyDB close error handling

mautrix · Jan 26, 2024 · 58d075e · 58d075e
1 parent 3226416
commit 58d075e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/dbutil/database.go b/dbutil/database.go
@@ -183,11 +183,12 @@ type Config struct {
 func (db *Database) Close() error {
 	err := db.RawDB.Close()
 	if db.ReadOnlyDB != nil {
-		err2 := db.ReadOnlyDB.Close()
-		if err == nil {
-			err = fmt.Errorf("closing read-only db failed: %w", err2)
-		} else {
-			err = fmt.Errorf("%w (closing read-only db also failed: %v)", err, err2)
+		if err2 := db.ReadOnlyDB.Close(); err2 != nil {
+			if err == nil {
+				err = fmt.Errorf("closing read-only db failed: %w", err2)
+			} else {
+				err = fmt.Errorf("%w (closing read-only db also failed: %v)", err, err2)
+			}
 		}
 	}
 	return err