update connect timeout etc.
This commit is contained in:
parent
964a1dbd9b
commit
69125cfbc2
@ -1,7 +1,6 @@
|
|||||||
package model
|
package model
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"qoobing.ai/payserver/config"
|
|
||||||
"qoobing.com/gomod/log"
|
"qoobing.com/gomod/log"
|
||||||
"qoobing.com/gomod/model"
|
"qoobing.com/gomod/model"
|
||||||
)
|
)
|
||||||
@ -15,8 +14,7 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
cfg := config.Instance()
|
//model.Init("pay", &cfg.PayDb)
|
||||||
model.Init("pay", &cfg.PayDb)
|
//model.Init("pay", &cfg.PayRedis)
|
||||||
model.Init("pay", &cfg.PayRedis)
|
|
||||||
log.Infof("model initlized")
|
log.Infof("model initlized")
|
||||||
}
|
}
|
||||||
|
|||||||
2
go.mod
2
go.mod
@ -3,7 +3,7 @@ module qoobing.com/gomod/model
|
|||||||
go 1.19.2
|
go 1.19.2
|
||||||
|
|
||||||
require (
|
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/log v1.4.2
|
||||||
qoobing.com/gomod/redis v1.3.9
|
qoobing.com/gomod/redis v1.3.9
|
||||||
)
|
)
|
||||||
|
|||||||
4
go.sum
4
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.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
|
||||||
gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
|
gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
|
||||||
gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
|
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.6 h1:vJNHxQmipxo/N0vmMMqoqQzhrrek/KuQuvAMpRYSJg0=
|
||||||
qoobing.com/gomod/gorm v0.0.4/go.mod h1:dGaviTlwtQl1amgr+DUmovoxk779WLL4+js7f2hvSwA=
|
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 h1:BR6WA79nUfvYhHww/Nbzu/iM9RdCfx3G3hg1XusjIIM=
|
||||||
qoobing.com/gomod/log v1.4.2/go.mod h1:rNXuq0d/EWog4+8hIEVGvkusLD/pzafYBQo6w+Evv6A=
|
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=
|
qoobing.com/gomod/redis v1.3.9 h1:wtojzRP7T+p+MAzkAUrU8GLNDUMU84ZJ3U/cWPrDby8=
|
||||||
|
|||||||
12
model.go
12
model.go
@ -117,7 +117,17 @@ func DbOf(name string) *gorm.DB {
|
|||||||
if !ok {
|
if !ok {
|
||||||
panic(errNoModelFound(name))
|
panic(errNoModelFound(name))
|
||||||
}
|
}
|
||||||
return gorm.NewSession(m.db)
|
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)
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
defer cancelFunc()
|
||||||
|
log.Debugf("success get db from model(%s)", name)
|
||||||
|
return db
|
||||||
}
|
}
|
||||||
|
|
||||||
func Redis() redis.Conn {
|
func Redis() redis.Conn {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user