shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-08 04:55:55 +08:00
Code Issues Projects Releases Wiki Activity

fix env conf load.

Browse Source
This commit is contained in:
Mrs4s 2021-09-15 13:43:39 +08:00
parent bfea93312a
commit 449ae96c8f
No known key found for this signature in database
GPG Key ID: 3186E98FA19CE3A7
1 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
global/config/config.go
View File

@ -161,6 +161,7 @@ func Get() *Config {
os.Exit(0) os.Exit(0)
} }
if hasEnvironmentConf {
// type convert tools // type convert tools
toInt64 := func(str string) int64 { toInt64 := func(str string) int64 {
i, _ := strconv.ParseInt(str, 10, 64) i, _ := strconv.ParseInt(str, 10, 64)
@ -175,7 +176,9 @@ func Get() *Config {
global.SetAtDefault(&config.Account.ReLogin.Delay, uint(toInt64(os.Getenv("GCQ_RELOGIN_DELAY"))), uint(0)) global.SetAtDefault(&config.Account.ReLogin.Delay, uint(toInt64(os.Getenv("GCQ_RELOGIN_DELAY"))), uint(0))
global.SetAtDefault(&config.Account.ReLogin.MaxTimes, uint(toInt64(os.Getenv("GCQ_RELOGIN_MAX_TIMES"))), uint(0)) global.SetAtDefault(&config.Account.ReLogin.MaxTimes, uint(toInt64(os.Getenv("GCQ_RELOGIN_MAX_TIMES"))), uint(0))
dbConf := &LevelDBConfig{Enable: global.EnsureBool(os.Getenv("GCQ_LEVELDB"), true)} dbConf := &LevelDBConfig{Enable: global.EnsureBool(os.Getenv("GCQ_LEVELDB"), true)}
if config.Database == nil {
config.Database = make(map[string]yaml.Node) config.Database = make(map[string]yaml.Node)
}
config.Database["leveldb"] = func() yaml.Node { config.Database["leveldb"] = func() yaml.Node {
n := &yaml.Node{} n := &yaml.Node{}
_ = n.Encode(dbConf) _ = n.Encode(dbConf)
@ -232,6 +235,7 @@ func Get() *Config {
_ = node.Encode(rwsConf) _ = node.Encode(rwsConf)
config.Servers = append(config.Servers, map[string]yaml.Node{"ws-reverse": *node}) config.Servers = append(config.Servers, map[string]yaml.Node{"ws-reverse": *node})
} }
}
}) })
return config return config
} }