TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2026-04-04 13:25:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

集群设置中增加服务设置

Browse Source
This commit is contained in:
刘祥超
2022-09-16 18:41:10 +08:00
parent 2eb19348cc
commit 0f060002e3
8 changed files with 4713 additions and 4113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/nodeconfigs/node_config.go
View File

@@ -54,8 +54,9 @@ type NodeConfig struct {
ParentNodes map[int64][]*ParentNodeConfig `yaml:"parentNodes" json:"parentNodes"` // clusterId => []*ParentNodeConfig
// 全局配置
GlobalConfig *serverconfigs.GlobalConfig `yaml:"globalConfig" json:"globalConfig"` // 全局配置
ProductConfig *ProductConfig `yaml:"productConfig" json:"productConfig"`
GlobalConfig *serverconfigs.GlobalConfig `yaml:"globalConfig" json:"globalConfig"` // 全局配置
GlobalServerConfig *serverconfigs.GlobalServerConfig `yaml:"globalServerConfig" json:"globalServerConfig"` // 服务全局配置，用来替代 GlobalConfig
ProductConfig *ProductConfig `yaml:"productConfig" json:"productConfig"`
// 集群统一配置
HTTPFirewallPolicies []*firewallconfigs.HTTPFirewallPolicy `yaml:"httpFirewallPolicies" json:"httpFirewallPolicies"`
@@ -119,7 +120,7 @@ func SharedNodeConfig() (*NodeConfig, error) {
return &NodeConfig{}, err
}
config := &NodeConfig{}
var config = &NodeConfig{}
err = json.Unmarshal(data, &config)
if err != nil {
return &NodeConfig{}, err
@@ -332,6 +333,14 @@ func (this *NodeConfig) Init() (err error, serverErrors []*ServerError) {
}
}
// 全局服务设置
if this.GlobalServerConfig != nil {
err = this.GlobalServerConfig.Init()
if err != nil {
return
}
}
return
}