fix cancel bug

example/model/model.go

@@ -1,7 +1,6 @@
 package model
 
 import (
-	"qoobing.ai/payserver/config"
 	"qoobing.com/gomod/log"
 	"qoobing.com/gomod/model"
 )
@@ -15,8 +14,7 @@ var (
 )
 
 func init() {
-	cfg := config.Instance()
-	model.Init("pay", &cfg.PayDb)
-	model.Init("pay", &cfg.PayRedis)
+	//model.Init("pay", &cfg.PayDb)
+	//model.Init("pay", &cfg.PayRedis)
 	log.Infof("model initlized")
 }

go.mod

@@ -3,7 +3,7 @@ module qoobing.com/gomod/model
 go 1.19.2
 
 require (
-	qoobing.com/gomod/gorm v0.0.4
+	qoobing.com/gomod/gorm v0.0.6
 	qoobing.com/gomod/log v1.4.2
 	qoobing.com/gomod/redis v1.3.9
 )

go.sum

@@ -42,8 +42,8 @@ gorm.io/driver/postgres v1.5.11/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSk
 gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
 gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
-qoobing.com/gomod/gorm v0.0.4 h1:tKBkL2AtMiB9txb3XsLll5+1NK5oIyJIuBGgm4N6OAQ=
-qoobing.com/gomod/gorm v0.0.4/go.mod h1:dGaviTlwtQl1amgr+DUmovoxk779WLL4+js7f2hvSwA=
+qoobing.com/gomod/gorm v0.0.6 h1:vJNHxQmipxo/N0vmMMqoqQzhrrek/KuQuvAMpRYSJg0=
+qoobing.com/gomod/gorm v0.0.6/go.mod h1:dGaviTlwtQl1amgr+DUmovoxk779WLL4+js7f2hvSwA=
 qoobing.com/gomod/log v1.4.2 h1:BR6WA79nUfvYhHww/Nbzu/iM9RdCfx3G3hg1XusjIIM=
 qoobing.com/gomod/log v1.4.2/go.mod h1:rNXuq0d/EWog4+8hIEVGvkusLD/pzafYBQo6w+Evv6A=
 qoobing.com/gomod/redis v1.3.9 h1:wtojzRP7T+p+MAzkAUrU8GLNDUMU84ZJ3U/cWPrDby8=

model.go

@@ -117,7 +117,19 @@ func DbOf(name string) *gorm.DB {
 	if !ok {
 		panic(errNoModelFound(name))
 	}
-	return gorm.NewSession(m.db)
+	log.Debugf("start get db from model(%s)", name)
+	//var ctx, cancelFunc = context.WithTimeout(m.db.Statement.Context, 3*time.Second)
+	//var db = gorm.NewSessionWithContext(m.db, ctx)
+	//var err = db.Error
+	//if err != nil {
+	//	cancelFunc()
+	//	log.Warningf("new gorm session failed, err:[%s]", err)
+	//	panic(err)
+	//}
+	//defer cancelFunc()
+	var db = gorm.NewSession(m.db)
+	log.Debugf("success get db from model(%s)", name)
+	return db
 }
 
 func Redis() redis.Conn {
@@ -129,13 +141,15 @@ func RedisOf(name string) redis.Conn {
 	if !ok {
 		panic(errNoModelFound(name))
 	}
+	log.Debugf("start get redis from model(%s) ...", name)
 	var ctx, cancelFunc = context.WithTimeout(context.Background(), 3*time.Second)
 	var conn, err = m.redisPool.GetContext(ctx)
 	if err != nil {
 		cancelFunc()
-		log.Warningf("get redis connect from pool failed, err:%s", err)
+		log.Warningf("get redis connect from pool failed, err:[%s], pool stats:[%+v]", err, m.redisPool.Stats)
 		panic(err)
 	}
+	log.Debugf("success get redis from model(%s)", name)
 	defer cancelFunc()
 	return conn
 }