From 09aa85f51c3a3d150d831c3137a3b5b644f50698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Sat, 18 Mar 2023 22:18:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=BB=84=E5=90=88=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=97=B6=E6=9C=8D=E5=8A=A1=E9=97=B4=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E5=85=B1=E7=94=A8=E8=AF=81=E4=B9=A6=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/nodes/http_client_pool_test.go | 14 ++++++++------
 internal/nodes/listener_base_test.go    |  2 +-
 internal/nodes/listener_manager.go      |  2 +-
 internal/nodes/node.go                  |  7 ++++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/internal/nodes/http_client_pool_test.go b/internal/nodes/http_client_pool_test.go
index bbac14f..fd65e58 100644
--- a/internal/nodes/http_client_pool_test.go
+++ b/internal/nodes/http_client_pool_test.go
@@ -11,12 +11,12 @@ func TestHTTPClientPool_Client(t *testing.T) {
 	pool := NewHTTPClientPool()
 
 	{
-		origin := &serverconfigs.OriginConfig{
+		var origin = &serverconfigs.OriginConfig{
 			Id:      1,
 			Version: 2,
 			Addr:    &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"},
 		}
-		err := origin.Init()
+		err := origin.Init(nil)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -43,7 +43,7 @@ func TestHTTPClientPool_cleanClients(t *testing.T) {
 		Version: 2,
 		Addr:    &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"},
 	}
-	err := origin.Init()
+	err := origin.Init(nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -60,17 +60,19 @@ func TestHTTPClientPool_cleanClients(t *testing.T) {
 func BenchmarkHTTPClientPool_Client(b *testing.B) {
 	runtime.GOMAXPROCS(1)
 
-	origin := &serverconfigs.OriginConfig{
+	var origin = &serverconfigs.OriginConfig{
 		Id:      1,
 		Version: 2,
 		Addr:    &serverconfigs.NetworkAddressConfig{Host: "127.0.0.1", PortRange: "1234"},
 	}
-	err := origin.Init()
+	err := origin.Init(nil)
 	if err != nil {
 		b.Fatal(err)
 	}
 
-	pool := NewHTTPClientPool()
+	b.ResetTimer()
+
+	var pool = NewHTTPClientPool()
 	for i := 0; i < b.N; i++ {
 		_, _ = pool.Client(nil, origin, origin.Addr.PickAddress(), nil, false)
 	}
diff --git a/internal/nodes/listener_base_test.go b/internal/nodes/listener_base_test.go
index 4047915..5a2ba75 100644
--- a/internal/nodes/listener_base_test.go
+++ b/internal/nodes/listener_base_test.go
@@ -23,7 +23,7 @@ func TestBaseListener_FindServer(t *testing.T) {
 				{Name: types.String(i) + ".hello.com"},
 			},
 		}
-		_ = server.Init()
+		_ = server.Init(nil)
 		listener.Group.Add(server)
 	}
 
diff --git a/internal/nodes/listener_manager.go b/internal/nodes/listener_manager.go
index a5deffb..599e69b 100644
--- a/internal/nodes/listener_manager.go
+++ b/internal/nodes/listener_manager.go
@@ -87,7 +87,7 @@ func (this *ListenerManager) Start(node *nodeconfigs.NodeConfig) error {
 	this.lastConfig = node
 
 	// 初始化
-	err, _ := node.Init()
+	err, _ := node.Init(nil)
 	if err != nil {
 		return err
 	}
diff --git a/internal/nodes/node.go b/internal/nodes/node.go
index 79795f6..e6558b3 100644
--- a/internal/nodes/node.go
+++ b/internal/nodes/node.go
@@ -191,7 +191,7 @@ func (this *Node) Start() {
 	}
 	teaconst.NodeId = nodeConfig.Id
 	teaconst.NodeIdString = types.String(teaconst.NodeId)
-	err, serverErrors := nodeConfig.Init()
+	err, serverErrors := nodeConfig.Init(nil)
 	if err != nil {
 		remotelogs.Error("NODE", "init node config failed: "+err.Error())
 		return
@@ -539,6 +539,7 @@ func (this *Node) syncConfig(taskVersion int64) error {
 		Version:         -1, // 更新所有版本
 		Compress:        true,
 		NodeTaskVersion: taskVersion,
+		UseDataMap:      true,
 	})
 	if err != nil {
 		return errors.New("read config from rpc failed: " + err.Error())
@@ -589,7 +590,7 @@ func (this *Node) syncConfig(taskVersion int64) error {
 		return err
 	}
 
-	err, serverErrors := nodeConfig.Init()
+	err, serverErrors := nodeConfig.Init(nil)
 	if err != nil {
 		return err
 	}
@@ -1210,7 +1211,7 @@ func (this *Node) reloadServer() {
 			}
 		}
 
-		err, serverErrors := newNodeConfig.Init()
+		err, serverErrors := newNodeConfig.Init(nil)
 		if err != nil {
 			remotelogs.Error("NODE", "apply server config error: "+err.Error())
 			return