From eba4eb850f0ecfb5839395aa125955ceaa2a454f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 16:39:07 +0800
Subject: [PATCH] Merge branch 'feat-serf'
---
pkg/sqlitex/sqlitex.go | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/pkg/sqlitex/sqlitex.go b/pkg/sqlitex/sqlitex.go
index 2c221a5..92fde9e 100644
--- a/pkg/sqlitex/sqlitex.go
+++ b/pkg/sqlitex/sqlitex.go
@@ -1,12 +1,8 @@
package sqlitex
import (
- "go.uber.org/zap"
- "gorm.io/driver/sqlite"
- "gorm.io/gorm"
- "gorm.io/gorm/logger"
- "gorm.io/gorm/schema"
- "moul.io/zapgorm2"
+ "github.com/jinzhu/gorm"
+ _ "github.com/jinzhu/gorm/dialects/sqlite"
"time"
)
@@ -22,33 +18,18 @@
var openDb *gorm.DB
-func Init(conf *Conf, log *zap.Logger) error {
- gConfig := &gorm.Config{
- PrepareStmt: true,
- NamingStrategy: schema.NamingStrategy{
- TablePrefix: "",
- SingularTable: true,
- },
- DisableForeignKeyConstraintWhenMigrating: true,
- }
- dbLogger := zapgorm2.New(log).LogMode(logger.Info)
- if !conf.LogMode {
- dbLogger = dbLogger.LogMode(logger.Silent)
- }
- gConfig.Logger = dbLogger
- db, err := gorm.Open(sqlite.Open(conf.Dsn), gConfig)
+func Init(conf *Conf) error {
+ db, err := gorm.Open("sqlite3", conf.Dsn)
if err != nil {
return err
}
- sqlDb, err := db.DB()
- if err != nil {
- return err
- }
+ sqlDb := db.DB()
sqlDb.SetMaxIdleConns(int(conf.MaxIdleCon))
sqlDb.SetMaxOpenConns(int(conf.MaxOpenCon))
sqlDb.SetConnMaxLifetime(time.Duration(conf.ConnMaxLifeTimeSecond) * time.Second)
sqlDb.SetConnMaxIdleTime(time.Duration(conf.ConnMaxIdleTimeSecond) * time.Second)
openDb = db
+ db.LogMode(true)
return nil
}
--
Gitblit v1.8.0