From 2f9ae0cb42d69cf2d46adc6fcad57d33ba1ccf00 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 22 Sep 2021 19:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/nodes/listener.go           | 4 ++--
 internal/nodes/listener_base.go      | 2 +-
 internal/nodes/listener_http.go      | 2 +-
 internal/nodes/listener_interface.go | 2 +-
 internal/nodes/listener_manager.go   | 2 +-
 internal/nodes/listener_tcp.go       | 2 +-
 internal/nodes/listener_udp.go       | 2 +-
 internal/nodes/listener_unix.go      | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/internal/nodes/listener.go b/internal/nodes/listener.go
index 91844d6..0055c7b 100644
--- a/internal/nodes/listener.go
+++ b/internal/nodes/listener.go
@@ -11,7 +11,7 @@ import (
 )
 
 type Listener struct {
-	group       *serverconfigs.ServerGroup
+	group       *serverconfigs.ServerAddressGroup
 	isListening bool
 	listener    ListenerInterface // 监听器
 
@@ -22,7 +22,7 @@ func NewListener() *Listener {
 	return &Listener{}
 }
 
-func (this *Listener) Reload(group *serverconfigs.ServerGroup) {
+func (this *Listener) Reload(group *serverconfigs.ServerAddressGroup) {
 	this.locker.Lock()
 	this.group = group
 	if this.listener != nil {
diff --git a/internal/nodes/listener_base.go b/internal/nodes/listener_base.go
index d06e32f..53502c1 100644
--- a/internal/nodes/listener_base.go
+++ b/internal/nodes/listener_base.go
@@ -16,7 +16,7 @@ type BaseListener struct {
 	namedServersLocker sync.RWMutex
 	namedServers       map[string]*NamedServer // 域名 => server
 
-	Group *serverconfigs.ServerGroup
+	Group *serverconfigs.ServerAddressGroup
 
 	countActiveConnections int64 // 当前活跃的连接数
 }
diff --git a/internal/nodes/listener_http.go b/internal/nodes/listener_http.go
index b8d8b7b..c5744c4 100644
--- a/internal/nodes/listener_http.go
+++ b/internal/nodes/listener_http.go
@@ -102,7 +102,7 @@ func (this *HTTPListener) Close() error {
 	return this.Listener.Close()
 }
 
-func (this *HTTPListener) Reload(group *serverconfigs.ServerGroup) {
+func (this *HTTPListener) Reload(group *serverconfigs.ServerAddressGroup) {
 	this.Group = group
 
 	this.Reset()
diff --git a/internal/nodes/listener_interface.go b/internal/nodes/listener_interface.go
index f346b72..1a3be7d 100644
--- a/internal/nodes/listener_interface.go
+++ b/internal/nodes/listener_interface.go
@@ -14,7 +14,7 @@ type ListenerInterface interface {
 	Close() error
 
 	// Reload 重载配置
-	Reload(serverGroup *serverconfigs.ServerGroup)
+	Reload(serverGroup *serverconfigs.ServerAddressGroup)
 
 	// CountActiveListeners 获取当前活跃的连接数
 	CountActiveListeners() int
diff --git a/internal/nodes/listener_manager.go b/internal/nodes/listener_manager.go
index 4056822..abfa7d0 100644
--- a/internal/nodes/listener_manager.go
+++ b/internal/nodes/listener_manager.go
@@ -70,7 +70,7 @@ func (this *ListenerManager) Start(node *nodeconfigs.NodeConfig) error {
 	groupAddrs := []string{}
 	availableServerGroups := node.AvailableGroups()
 	if !node.IsOn {
-		availableServerGroups = []*serverconfigs.ServerGroup{}
+		availableServerGroups = []*serverconfigs.ServerAddressGroup{}
 	}
 
 	if len(availableServerGroups) == 0 {
diff --git a/internal/nodes/listener_tcp.go b/internal/nodes/listener_tcp.go
index 0951b9d..38eeeed 100644
--- a/internal/nodes/listener_tcp.go
+++ b/internal/nodes/listener_tcp.go
@@ -42,7 +42,7 @@ func (this *TCPListener) Serve() error {
 	return nil
 }
 
-func (this *TCPListener) Reload(group *serverconfigs.ServerGroup) {
+func (this *TCPListener) Reload(group *serverconfigs.ServerAddressGroup) {
 	this.Group = group
 	this.Reset()
 }
diff --git a/internal/nodes/listener_udp.go b/internal/nodes/listener_udp.go
index 137ee2d..1c00a30 100644
--- a/internal/nodes/listener_udp.go
+++ b/internal/nodes/listener_udp.go
@@ -84,7 +84,7 @@ func (this *UDPListener) Close() error {
 	return this.Listener.Close()
 }
 
-func (this *UDPListener) Reload(group *serverconfigs.ServerGroup) {
+func (this *UDPListener) Reload(group *serverconfigs.ServerAddressGroup) {
 	this.Group = group
 	this.Reset()
 }
diff --git a/internal/nodes/listener_unix.go b/internal/nodes/listener_unix.go
index a2475af..863665c 100644
--- a/internal/nodes/listener_unix.go
+++ b/internal/nodes/listener_unix.go
@@ -22,7 +22,7 @@ func (this *UnixListener) Close() error {
 	return nil
 }
 
-func (this *UnixListener) Reload(group *serverconfigs.ServerGroup) {
+func (this *UnixListener) Reload(group *serverconfigs.ServerAddressGroup) {
 	this.Group = group
 	this.Reset()
 }