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

节点组合配置时服务间可以共用证书数据

Browse Source
This commit is contained in:
刘祥超
2023-03-18 22:18:48 +08:00
parent c6279a1076
commit 09aa85f51c
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/nodes/http_client_pool_test.go
View File

@@ -11,12 +11,12 @@ func TestHTTPClientPool_Client(t *testing.T) {
pool := NewHTTPClientPool() pool := NewHTTPClientPool()
{ {
origin := &serverconfigs.OriginConfig{ var origin = &serverconfigs.OriginConfig{
Id: 1, Id: 1,
Version: 2, Version: 2,
Addr: &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"}, Addr: &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"},
} }
err := origin.Init() err := origin.Init(nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -43,7 +43,7 @@ func TestHTTPClientPool_cleanClients(t *testing.T) {
Version: 2, Version: 2,
Addr: &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"}, Addr: &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"},
} }
err := origin.Init() err := origin.Init(nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -60,17 +60,19 @@ func TestHTTPClientPool_cleanClients(t *testing.T) {
func BenchmarkHTTPClientPool_Client(b *testing.B) { func BenchmarkHTTPClientPool_Client(b *testing.B) {
runtime.GOMAXPROCS(1) runtime.GOMAXPROCS(1)
origin := &serverconfigs.OriginConfig{ var origin = &serverconfigs.OriginConfig{
Id: 1, Id: 1,
Version: 2, Version: 2,
Addr: &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"}, Addr: &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"},
} }
err := origin.Init() err := origin.Init(nil)
if err != nil { if err != nil {
b.Fatal(err) b.Fatal(err)
} }
pool := NewHTTPClientPool() b.ResetTimer()
var pool = NewHTTPClientPool()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
_, _ = pool.Client(nil, origin, origin.Addr.PickAddress(), nil, false) _, _ = pool.Client(nil, origin, origin.Addr.PickAddress(), nil, false)
} }

2
internal/nodes/listener_base_test.go
View File

@@ -23,7 +23,7 @@ func TestBaseListener_FindServer(t *testing.T) {
{Name: types.String(i) + ".hello.com"}, {Name: types.String(i) + ".hello.com"},
}, },
} }
_ = server.Init() _ = server.Init(nil)
listener.Group.Add(server) listener.Group.Add(server)
} }

2
internal/nodes/listener_manager.go
View File

@@ -87,7 +87,7 @@ func (this *ListenerManager) Start(node *nodeconfigs.NodeConfig) error {
this.lastConfig = node this.lastConfig = node
// 初始化 // 初始化
err, _ := node.Init() err, _ := node.Init(nil)
if err != nil { if err != nil {
return err return err
} }

7
internal/nodes/node.go
View File

@@ -191,7 +191,7 @@ func (this *Node) Start() {
} }
teaconst.NodeId = nodeConfig.Id teaconst.NodeId = nodeConfig.Id
teaconst.NodeIdString = types.String(teaconst.NodeId) teaconst.NodeIdString = types.String(teaconst.NodeId)
err, serverErrors := nodeConfig.Init() err, serverErrors := nodeConfig.Init(nil)
if err != nil { if err != nil {
remotelogs.Error("NODE", "init node config failed: "+err.Error()) remotelogs.Error("NODE", "init node config failed: "+err.Error())
return return
@@ -539,6 +539,7 @@ func (this *Node) syncConfig(taskVersion int64) error {
Version: -1, // 更新所有版本 Version: -1, // 更新所有版本
Compress: true, Compress: true,
NodeTaskVersion: taskVersion, NodeTaskVersion: taskVersion,
UseDataMap: true,
}) })
if err != nil { if err != nil {
return errors.New("read config from rpc failed: " + err.Error()) return errors.New("read config from rpc failed: " + err.Error())
@@ -589,7 +590,7 @@ func (this *Node) syncConfig(taskVersion int64) error {
return err return err
} }
err, serverErrors := nodeConfig.Init() err, serverErrors := nodeConfig.Init(nil)
if err != nil { if err != nil {
return err return err
} }
@@ -1210,7 +1211,7 @@ func (this *Node) reloadServer() {
} }
} }
err, serverErrors := newNodeConfig.Init() err, serverErrors := newNodeConfig.Init(nil)
if err != nil { if err != nil {
remotelogs.Error("NODE", "apply server config error: "+err.Error()) remotelogs.Error("NODE", "apply server config error: "+err.Error())
return return