Merge pull request #122 from sunmi-OS/feature/bugfix

optimize db initialization methods
sunmi-OS · Aug 16, 2023 · a10d5f5 · a10d5f5
2 parents 01d35e8 + 82d9ee1
commit a10d5f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/db/mongodb/mongo.go b/db/mongodb/mongo.go
@@ -37,7 +37,6 @@ func NewDB(dbname string) {
 	if err != nil {
 		panic(err)
 	}
-	dbMap.Delete(dbname)
 	dbMap.Store(dbname, orm)
 	if oldConn != nil {
 		db, _ := oldConn.(*mongo.Database)

diff --git a/db/orm/gorm.go b/db/orm/gorm.go
@@ -54,9 +54,9 @@ func NewOrUpdateDB(dbname string) error {
 	if _Gorm == nil {
 		_Gorm = &Client{defaultDbName: defaultName}
 	}
-	// second: load gorm client
+	// load gorm client
 	oldGorm, _ := _Gorm.gormMaps.Load(dbname)
-	// first: open new gorm client
+	// open new gorm client
 	err = utils.Retry(func() error {
 		orm, err = openORM(dbname)
 		if err != nil {
@@ -72,10 +72,8 @@ func NewOrUpdateDB(dbname string) error {
 		}
 		return err
 	}
-	// third: delete old gorm client and store the new gorm client
-	_Gorm.gormMaps.Delete(dbname)
 	_Gorm.gormMaps.Store(dbname, orm)
-	// fourth: if old client is not nil, delete and close connection
+	// if old client is not nil, delete and close connection
 	if oldGorm != nil {
 		db, _ := oldGorm.(*gorm.DB).DB()
 		if db != nil {