feat: 增强 PostgreSQL 配置,添加连接生命周期和日志配置选项

This commit is contained in:
Rogee
2025-09-11 16:26:47 +08:00
parent 55a335e9ad
commit da4875fc16
2 changed files with 105 additions and 12 deletions

65
templates/project/providers/postgres/config.go.tpl Executable file → Normal file
View File

@@ -2,9 +2,12 @@ package postgres
import ( import (
"fmt" "fmt"
"strconv"
"time"
"go.ipao.vip/atom/container" "go.ipao.vip/atom/container"
"go.ipao.vip/atom/opt" "go.ipao.vip/atom/opt"
"gorm.io/gorm/logger"
) )
const DefaultPrefix = "Database" const DefaultPrefix = "Database"
@@ -31,6 +34,42 @@ type Config struct {
Singular bool // true表示开启 Singular bool // true表示开启
MaxIdleConns int // MaxIdleConns int //
MaxOpenConns int // MaxOpenConns int //
// 0
ConnMaxLifetimeSeconds uint
ConnMaxIdleTimeSeconds uint
// GORM
LogLevel string // silent|error|warn|infoinfo
SlowThresholdMs uint // 200
ParameterizedQueries bool // 便
PrepareStmt bool //
SkipDefaultTransaction bool //
// DSN
UseSearchPath bool // DSN search_path
ApplicationName string // application_name
}
func (m Config) GormSlowThreshold() time.Duration {
if m.SlowThresholdMs == 0 {
return 200 * time.Millisecond // 200ms
}
return time.Duration(m.SlowThresholdMs) * time.Millisecond
}
func (m Config) GormLogLevel() logger.LogLevel {
switch m.LogLevel {
case "silent":
return logger.Silent
case "error":
return logger.Error
case "warn":
return logger.Warn
case "info", "":
return logger.Info
default:
return logger.Info
}
} }
func (m *Config) checkDefault() { func (m *Config) checkDefault() {
@@ -64,16 +103,34 @@ func (m *Config) checkDefault() {
} }
func (m *Config) EmptyDsn() string { func (m *Config) EmptyDsn() string {
// DSN
dsnTpl := "host=%s user=%s password=%s port=%d dbname=%s sslmode=%s TimeZone=%s" dsnTpl := "host=%s user=%s password=%s port=%d dbname=%s sslmode=%s TimeZone=%s"
m.checkDefault() m.checkDefault()
base := fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Port, m.Database, m.SslMode, m.TimeZone)
return fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Port, m.Database, m.SslMode, m.TimeZone) //
extras := ""
if m.UseSearchPath && m.Schema != "" {
extras += " search_path=" + m.Schema
}
if m.ApplicationName != "" {
extras += " application_name=" + strconv.Quote(m.ApplicationName)
}
return base + extras
} }
// DSN connection dsn // DSN connection dsn
func (m *Config) DSN() string { func (m *Config) DSN() string {
// DSN
dsnTpl := "host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s" dsnTpl := "host=%s user=%s password=%s dbname=%s port=%d sslmode=%s TimeZone=%s"
m.checkDefault() m.checkDefault()
base := fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Database, m.Port, m.SslMode, m.TimeZone)
return fmt.Sprintf(dsnTpl, m.Host, m.Username, m.Password, m.Database, m.Port, m.SslMode, m.TimeZone) //
extras := ""
if m.UseSearchPath && m.Schema != "" {
extras += " search_path=" + m.Schema
}
if m.ApplicationName != "" {
extras += " application_name=" + strconv.Quote(m.ApplicationName)
}
return base + extras
} }

View File

@@ -1,6 +1,9 @@
package postgres package postgres
import ( import (
"context"
"time"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"go.ipao.vip/atom/container" "go.ipao.vip/atom/container"
"go.ipao.vip/atom/opt" "go.ipao.vip/atom/opt"
@@ -18,10 +21,24 @@ func Provide(opts ...opt.Option) error {
} }
return container.Container.Provide(func() (*gorm.DB, *Config, error) { return container.Container.Provide(func() (*gorm.DB, *Config, error) {
dbConfig := postgres.Config{ dbConfig := postgres.Config{DSN: conf.DSN()}
DSN: conf.DSN(), // DSN data source name
} //
logrus.Info("Open PostgreSQL:", conf.DSN()) logrus.
WithFields(
logrus.Fields{
"host": conf.Host,
"port": conf.Port,
"db": conf.Database,
"schema": conf.Schema,
"ssl": conf.SslMode,
},
).
Info("opening PostgreSQL connection")
//
lvl := conf.GormLogLevel()
slow := conf.GormSlowThreshold()
gormConfig := gorm.Config{ gormConfig := gorm.Config{
NamingStrategy: schema.NamingStrategy{ NamingStrategy: schema.NamingStrategy{
@@ -29,11 +46,14 @@ func Provide(opts ...opt.Option) error {
SingularTable: conf.Singular, SingularTable: conf.Singular,
}, },
DisableForeignKeyConstraintWhenMigrating: true, DisableForeignKeyConstraintWhenMigrating: true,
PrepareStmt: conf.PrepareStmt,
SkipDefaultTransaction: conf.SkipDefaultTransaction,
Logger: logger.New(logrus.StandardLogger(), logger.Config{ Logger: logger.New(logrus.StandardLogger(), logger.Config{
SlowThreshold: 200, // SQL SlowThreshold: slow,
LogLevel: logger.Info, LogLevel: lvl,
IgnoreRecordNotFoundError: true, // ErrRecordNotFound IgnoreRecordNotFoundError: true,
Colorful: false, Colorful: false,
ParameterizedQueries: conf.ParameterizedQueries,
}), }),
} }
@@ -48,7 +68,23 @@ func Provide(opts ...opt.Option) error {
} }
sqlDB.SetMaxIdleConns(conf.MaxIdleConns) sqlDB.SetMaxIdleConns(conf.MaxIdleConns)
sqlDB.SetMaxOpenConns(conf.MaxOpenConns) sqlDB.SetMaxOpenConns(conf.MaxOpenConns)
if conf.ConnMaxLifetimeSeconds > 0 {
sqlDB.SetConnMaxLifetime(time.Duration(conf.ConnMaxLifetimeSeconds) * time.Second)
}
if conf.ConnMaxIdleTimeSeconds > 0 {
sqlDB.SetConnMaxIdleTime(time.Duration(conf.ConnMaxIdleTimeSeconds) * time.Second)
}
return db, &conf, err // Ping
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if err := sqlDB.PingContext(ctx); err != nil {
return nil, nil, err
}
//
container.AddCloseAble(func() { _ = sqlDB.Close() })
return db, &conf, nil
}, o.DiOptions()...) }, o.DiOptions()...)
} }