增加新的添加数据库实例的方式
This commit is contained in:
parent
f68424bdae
commit
ba8c73985c
25
client.go
25
client.go
@ -53,9 +53,8 @@ type client struct {
|
||||
// Date : 19:19 2022/6/5
|
||||
func (c *client) AddWithConfigFile(cfgFilePath string, logInstance *zap.Logger) error {
|
||||
var (
|
||||
err error
|
||||
cfg *cfgFile
|
||||
dbClient *DBClient
|
||||
err error
|
||||
cfg *cfgFile
|
||||
)
|
||||
|
||||
if cfg, err = c.getCfg(cfgFilePath); nil != err {
|
||||
@ -65,18 +64,28 @@ func (c *client) AddWithConfigFile(cfgFilePath string, logInstance *zap.Logger)
|
||||
// 不支持的配置文件格式
|
||||
return nil
|
||||
}
|
||||
dbClient = &DBClient{
|
||||
dbFlag: cfg.Flag,
|
||||
return c.AddWithConfig(cfg.Flag, logInstance, cfg.Config)
|
||||
}
|
||||
|
||||
// AddWithConfig ...
|
||||
//
|
||||
// Author : go_developer@163.com<白茶清欢>
|
||||
//
|
||||
// Date : 20:41 2023/4/18
|
||||
func (c *client) AddWithConfig(flag string, logInstance *zap.Logger, databaseConfig *Database) error {
|
||||
dbClient := &DBClient{
|
||||
dbFlag: flag,
|
||||
loggerInstance: logInstance,
|
||||
master: nil,
|
||||
slave: nil,
|
||||
extraFieldList: nil,
|
||||
cfg: Driver{},
|
||||
}
|
||||
if dbClient.master, err = c.GetDatabaseClient(cfg.Config.Master, logInstance); nil != err {
|
||||
var err error
|
||||
if dbClient.master, err = c.GetDatabaseClient(databaseConfig.Master, logInstance); nil != err {
|
||||
return err
|
||||
}
|
||||
if dbClient.slave, err = c.GetDatabaseClient(cfg.Config.Slave, logInstance); nil != err {
|
||||
if dbClient.slave, err = c.GetDatabaseClient(databaseConfig.Slave, logInstance); nil != err {
|
||||
return err
|
||||
}
|
||||
c.lock.Lock()
|
||||
@ -117,7 +126,7 @@ func (c *client) getCfg(cfgPath string) (*cfgFile, error) {
|
||||
Path: cfgPath,
|
||||
Type: "",
|
||||
Flag: fileFlagArr[len(fileFlagArr)-1],
|
||||
Config: Database{},
|
||||
Config: &Database{},
|
||||
}
|
||||
var (
|
||||
err error
|
||||
|
@ -28,10 +28,10 @@ type DBConfig struct {
|
||||
//
|
||||
// Date : 14:47 2022/6/9
|
||||
type cfgFile struct {
|
||||
Flag string `json:"flag"` // 数据库标识
|
||||
Path string `json:"path"` // 配置文件路径
|
||||
Type string `json:"type"` // 配置文件类型
|
||||
Config Database `json:"config"` // 解析之后的配置文件
|
||||
Flag string `json:"flag"` // 数据库标识
|
||||
Path string `json:"path"` // 配置文件路径
|
||||
Type string `json:"type"` // 配置文件类型
|
||||
Config *Database `json:"config"` // 解析之后的配置文件
|
||||
}
|
||||
|
||||
const (
|
||||
|
Loading…
x
Reference in New Issue
Block a user