fix cancel bug
This commit is contained in:
parent
69653d6bf7
commit
afc1ac82d5
21
model.go
21
model.go
@ -117,16 +117,17 @@ 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
|
||||
if err != nil {
|
||||
cancelFunc()
|
||||
log.Warningf("new gorm session failed, err:[%s]", err)
|
||||
panic(err)
|
||||
}
|
||||
defer cancelFunc()
|
||||
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
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user