From 69125cfbc2a6227ce8198d714b53f22d74188efa Mon Sep 17 00:00:00 2001 From: bryan Date: Sat, 31 Jan 2026 08:32:55 +0800 Subject: [PATCH] update connect timeout etc. --- example/model/model.go | 6 ++---- go.mod | 2 +- go.sum | 4 ++-- model.go | 12 +++++++++++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/example/model/model.go b/example/model/model.go index e5fe828..832a086 100644 --- a/example/model/model.go +++ b/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") } diff --git a/go.mod b/go.mod index 3cb4f1e..e6872b5 100644 --- a/go.mod +++ b/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 ) diff --git a/go.sum b/go.sum index bfbbde2..e3c5449 100644 --- a/go.sum +++ b/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= diff --git a/model.go b/model.go index ae6ec76..d16dbac 100644 --- a/model.go +++ b/model.go @@ -117,7 +117,17 @@ 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(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 {