Compare commits
No commits in common. "69653d6bf75c726f35079137042b5e14111bf1d8" and "69125cfbc2a6227ce8198d714b53f22d74188efa" have entirely different histories.
69653d6bf7
...
69125cfbc2
9
model.go
9
model.go
@ -117,10 +117,9 @@ func DbOf(name string) *gorm.DB {
|
||||
if !ok {
|
||||
panic(errNoModelFound(name))
|
||||
}
|
||||
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
|
||||
log.Debugf("start get db from model(%s)", name)
|
||||
var ctx, cancelFunc = context.WithTimeout(context.Background(), 3*time.Second)
|
||||
var db, err = gorm.NewSessionWithContext(m.db, ctx)
|
||||
if err != nil {
|
||||
cancelFunc()
|
||||
log.Warningf("new gorm session failed, err:[%s]", err)
|
||||
@ -140,7 +139,6 @@ 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 {
|
||||
@ -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)
|
||||
panic(err)
|
||||
}
|
||||
log.Debugf("success get redis from model(%s)", name)
|
||||
defer cancelFunc()
|
||||
return conn
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user