model.go

@@ -117,17 +117,16 @@ func DbOf(name string) *gorm.DB {
 	if !ok {
 		panic(errNoModelFound(name))
 	}
-	log.Debugf("start get db from model(%s)", name)
+	log.Debugf("start get db from model(%s) ...", name)
-	//var ctx, cancelFunc = context.WithTimeout(m.db.Statement.Context, 3*time.Second)
+	var ctx, cancelFunc = context.WithTimeout(m.db.Statement.Context, 3*time.Second)
-	//var db = gorm.NewSessionWithContext(m.db, ctx)
+	var db = gorm.NewSessionWithContext(m.db, ctx)
-	//var err = db.Error
+	var err = db.Error
-	//if err != nil {
+	if err != nil {
-	//	cancelFunc()
+		cancelFunc()
-	//	log.Warningf("new gorm session failed, err:[%s]", err)
+		log.Warningf("new gorm session failed, err:[%s]", err)
-	//	panic(err)
+		panic(err)
-	//}
+	}
-	//defer cancelFunc()
+	defer cancelFunc()
-	var db = gorm.NewSession(m.db)
 	log.Debugf("success get db from model(%s)", name)
 	return db
 }