gomod/model
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gomod:69653d6bf75c726f35079137042b5e14111bf1d8
Branches Tags
gomod:main
gomod:v0.1.8
gomod:v0.1.7
gomod:v0.1.6
gomod:v0.1.5
gomod:v0.1.4
gomod:v0.1.3
gomod:v0.1.2
gomod:v0.1.1
gomod:v0.1.0
gomod:v0.0.2
gomod:v0.0.1
..
compare: gomod:69125cfbc2a6227ce8198d714b53f22d74188efa
Branches Tags
gomod:main
gomod:v0.1.8
gomod:v0.1.7
gomod:v0.1.6
gomod:v0.1.5
gomod:v0.1.4
gomod:v0.1.3
gomod:v0.1.2
gomod:v0.1.1
gomod:v0.1.0
gomod:v0.0.2
gomod:v0.0.1

No commits in common. "69653d6bf75c726f35079137042b5e14111bf1d8" and "69125cfbc2a6227ce8198d714b53f22d74188efa" have entirely different histories.
69653d6bf7 ... 69125cfbc2

1 changed files with 3 additions and 6 deletions
Show Stats Expand all files Collapse all files

9
model.go
View File

@ -117,10 +117,9 @@ func DbOf(name string) *gorm.DB {
if !ok { if !ok {
panic(errNoModelFound(name)) 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(context.Background(), 3*time.Second)
var db = gorm.NewSessionWithContext(m.db, ctx) var db, err = gorm.NewSessionWithContext(m.db, ctx)
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)
@ -140,7 +139,6 @@ func RedisOf(name string) redis.Conn {
if !ok { if !ok {
panic(errNoModelFound(name)) panic(errNoModelFound(name))
} }
log.Debugf("start get redis from model(%s) ...", name)
var ctx, cancelFunc = context.WithTimeout(context.Background(), 3*time.Second) var ctx, cancelFunc = context.WithTimeout(context.Background(), 3*time.Second)
var conn, err = m.redisPool.GetContext(ctx) var conn, err = m.redisPool.GetContext(ctx)
if err != nil { if err != nil {
@ -148,7 +146,6 @@ func RedisOf(name string) redis.Conn {
log.Warningf("get redis connect from pool failed, err:[%s], pool stats:[%+v]", err, m.redisPool.Stats) log.Warningf("get redis connect from pool failed, err:[%s], pool stats:[%+v]", err, m.redisPool.Stats)
panic(err) panic(err)
} }
log.Debugf("success get redis from model(%s)", name)
defer cancelFunc() defer cancelFunc()
return conn return conn
} }