Merge pull request #37 from hidevopsio/refactor/instance-scope

fixes the issue that app creash caused by nil sql client
hidevopsio · Aug 25, 2024 · aa1e472 · aa1e472
2 parents e01cf9a + e965385
commit aa1e472
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/starter/gorm/autoconfigure.go b/starter/gorm/autoconfigure.go
@@ -90,8 +90,8 @@ func (c *configuration) DB() (db *DB, err error) {
 		log.Errorf("failed to connect %v, err: %v", report, err)
 		return
 	}
-
-	if sqlDB.Ping() == nil {
+	sqlDB, err = db.DB.DB()
+	if err == nil && sqlDB.Ping() == nil {
 		// If the connection is alive, assign the new connection
 		c.db = db
 		log.Infof("%v is connected", report)

diff --git a/starter/sqlx/autoconfigure.go b/starter/sqlx/autoconfigure.go
@@ -87,8 +87,7 @@ func (c *configuration) DB() (db *DB, err error) {
 		log.Errorf("failed to connect db: %v", err)
 		return
 	}
-
-	if sqlDB.Ping() == nil {
+	if db.DB.Ping() == nil {
 		// If the connection is alive, assign the new connection
 		c.db = db
 		log.Infof("%v is connected", report)