TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-03 23:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

API RPC配置增加disableUpdate，可以停用自动更新API节点

Browse Source
This commit is contained in:
GoEdgeLab
2022-07-21 14:06:38 +08:00
parent eb732a022a
commit 51c1d2fa7c
5 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/configs/api_config.go
View File

@@ -9,7 +9,8 @@ import (
// APIConfig 节点API配置 // APIConfig 节点API配置
type APIConfig struct { type APIConfig struct {
RPC struct { RPC struct {
Endpoints []string `yaml:"endpoints"` Endpoints []string `yaml:"endpoints"`
DisableUpdate bool `yaml:"disableUpdate"`
} `yaml:"rpc"` } `yaml:"rpc"`
NodeId string `yaml:"nodeId"` NodeId string `yaml:"nodeId"`
Secret string `yaml:"secret"` Secret string `yaml:"secret"`
@@ -30,7 +31,7 @@ func LoadAPIConfig() (*APIConfig, error) {
return config, nil return config, nil
} }
// 保存到文件 // WriteFile 保存到文件
func (this *APIConfig) WriteFile(path string) error { func (this *APIConfig) WriteFile(path string) error {
data, err := yaml.Marshal(this) data, err := yaml.Marshal(this)
if err != nil { if err != nil {

12
internal/configs/api_config_test.go
View File

@@ -1,11 +1,15 @@
package configs package configs_test
import "testing" import (
"github.com/TeaOSLab/EdgeNode/internal/configs"
_ "github.com/iwind/TeaGo/bootstrap"
"testing"
)
func TestLoadAPIConfig(t *testing.T) { func TestLoadAPIConfig(t *testing.T) {
config, err := LoadAPIConfig() config, err := configs.LoadAPIConfig()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
t.Log(config) t.Logf("%+v", config)
} }

7
internal/configs/cluster_config.go
View File

@@ -1,10 +1,11 @@
package configs package configs
// 集群配置 // ClusterConfig 集群配置
type ClusterConfig struct { type ClusterConfig struct {
RPC struct { RPC struct {
Endpoints []string `yaml:"endpoints"` Endpoints []string `yaml:"endpoints"`
DisableUpdate bool `yaml:"disableUpdate"`
} `yaml:"rpc"` } `yaml:"rpc"`
ClusterId string `yaml:"clusterId"` ClusterId string `yaml:"clusterId"`
Secret string `yaml:"secret"` Secret string `yaml:"secret"`
} }

8
internal/nodes/node.go
View File

@@ -635,11 +635,13 @@ func (this *Node) checkClusterConfig() error {
if len(resp.Endpoints) == 0 { if len(resp.Endpoints) == 0 {
resp.Endpoints = []string{} resp.Endpoints = []string{}
} }
apiConfig := &configs.APIConfig{ var apiConfig = &configs.APIConfig{
RPC: struct { RPC: struct {
Endpoints []string `yaml:"endpoints"` Endpoints []string `yaml:"endpoints"`
DisableUpdate bool `yaml:"disableUpdate"`
}{ }{
Endpoints: resp.Endpoints, Endpoints: resp.Endpoints,
DisableUpdate: false,
}, },
NodeId: resp.UniqueId, NodeId: resp.UniqueId,
Secret: resp.Secret, Secret: resp.Secret,

18
internal/nodes/task_sync_api_nodes.go
View File

@@ -63,6 +63,16 @@ func (this *SyncAPINodesTask) Stop() {
} }
func (this *SyncAPINodesTask) Loop() error { func (this *SyncAPINodesTask) Loop() error {
config, err := configs.LoadAPIConfig()
if err != nil {
return err
}
// 是否禁止自动升级
if config.RPC.DisableUpdate {
return nil
}
var tr = trackers.Begin("SYNC_API_NODES") var tr = trackers.Begin("SYNC_API_NODES")
defer tr.End() defer tr.End()
@@ -76,7 +86,7 @@ func (this *SyncAPINodesTask) Loop() error {
return err return err
} }
newEndpoints := []string{} var newEndpoints = []string{}
for _, node := range resp.ApiNodes { for _, node := range resp.ApiNodes {
if !node.IsOn { if !node.IsOn {
continue continue
@@ -85,16 +95,12 @@ func (this *SyncAPINodesTask) Loop() error {
} }
// 和现有的对比 // 和现有的对比
config, err := configs.LoadAPIConfig()
if err != nil {
return err
}
if this.isSame(newEndpoints, config.RPC.Endpoints) { if this.isSame(newEndpoints, config.RPC.Endpoints) {
return nil return nil
} }
// 测试是否有API节点可用 // 测试是否有API节点可用
hasOk := this.testEndpoints(newEndpoints) var hasOk = this.testEndpoints(newEndpoints)
if !hasOk { if !hasOk {
return nil return nil
} }