Merge pull request #1040 from wakatime/feature/recover-close-db

gandarez · web-flow · commit 1fd560a09a58 · 2024-04-04T14:02:04.000-03:00
Recover from panic when closing db
diff --git a/pkg/offline/offline.go b/pkg/offline/offline.go
@@ -411,6 +411,13 @@ func openDB(filepath string) (db *bolt.DB, _ func(), err error) {
 	}
 
 	return db, func() {
+		// recover from panic when closing db
+		defer func() {
+			if r := recover(); r != nil {
+				log.Warnf("panicked: failed to close db file: %v", r)
+			}
+		}()
+
 		if err := db.Close(); err != nil {
 			log.Debugf("failed to close db file: %s", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,13 @@ func openDB(filepath string) (db *bolt.DB, _ func(), err error) {`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`return db, func() {`
	`414`	`+ // recover from panic when closing db`
	`415`	`+ defer func() {`
	`416`	`+ if r := recover(); r != nil {`
	`417`	`+ log.Warnf("panicked: failed to close db file: %v", r)`
	`418`	`+ }`
	`419`	`+ }()`
	`420`	`+`
`414`	`421`	`if err := db.Close(); err != nil {`
`415`	`422`	`log.Debugf("failed to close db file: %s", err)`
`416`	`423`	`}`