From 20c802c51d74467bbd37d367bc8cd044ad58baff Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Fri, 31 Mar 2023 14:06:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=95=86=E4=B8=9A=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/nodes/node.go | 16 +++++++++++++--- internal/nodes/node_ext.go | 8 ++++++++ internal/rpc/rpc_client.go | 2 ++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/internal/nodes/node.go b/internal/nodes/node.go index a6cd248..326873c 100644 --- a/internal/nodes/node.go +++ b/internal/nodes/node.go @@ -55,6 +55,7 @@ var nodeConfigChangedNotify = make(chan bool, 8) var nodeConfigUpdatedAt int64 var DaemonIsOn = false var DaemonPid = 0 +var nodeInstance *Node // Node 节点 type Node struct { @@ -79,12 +80,13 @@ type Node struct { } func NewNode() *Node { - return &Node{ + nodeInstance = &Node{ sock: gosock.NewTmpSock(teaconst.ProcessName), oldMaxThreads: -1, oldMaxCPU: -1, updatingServerMap: map[int64]*serverconfigs.ServerConfig{}, } + return nodeInstance } // Test 检查配置 @@ -458,6 +460,11 @@ func (this *Node) execTask(rpcClient *rpc.RPCClient, task *pb.NodeTask) error { } } } + case "plusChanged": + err := this.notifyPlusChange() + if err != nil { + return err + } default: remotelogs.Error("NODE", "task '"+types.String(task.Id)+"', type '"+task.Type+"' has not been handled") } @@ -1188,6 +1195,9 @@ func (this *Node) onReload(config *nodeconfigs.NodeConfig, reloadAll bool) { // API Node地址,这里不限制是否为空,因为在为空时仍然要有对应的处理 this.changeAPINodeAddrs(config.APINodeAddrs) } + + // 刷新IP库 + this.reloadIPLibrary() } // reload server config @@ -1205,10 +1215,10 @@ func (this *Node) reloadServer() { } for serverId, serverConfig := range updatingServerMap { if serverConfig != nil { - remotelogs.Debug("NODE", "load server '" + types.String(serverId) + "'") + remotelogs.Debug("NODE", "load server '"+types.String(serverId)+"'") newNodeConfig.AddServer(serverConfig) } else { - remotelogs.Debug("NODE", "remove server '" + types.String(serverId) + "'") + remotelogs.Debug("NODE", "remove server '"+types.String(serverId)+"'") newNodeConfig.RemoveServer(serverId) } } diff --git a/internal/nodes/node_ext.go b/internal/nodes/node_ext.go index 763e226..90a64f1 100644 --- a/internal/nodes/node_ext.go +++ b/internal/nodes/node_ext.go @@ -7,3 +7,11 @@ package nodes func (this *Node) reloadCommonScripts() error { return nil } + +func (this *Node) reloadIPLibrary() { + +} + +func (this *Node) notifyPlusChange() error { + return nil +} diff --git a/internal/rpc/rpc_client.go b/internal/rpc/rpc_client.go index f5f9f18..063801f 100644 --- a/internal/rpc/rpc_client.go +++ b/internal/rpc/rpc_client.go @@ -51,6 +51,7 @@ type RPCClient struct { ScriptRPC pb.ScriptServiceClient UserRPC pb.UserServiceClient ClientAgentIPRPC pb.ClientAgentIPServiceClient + AuthorityKeyRPC pb.AuthorityKeyServiceClient } func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) { @@ -85,6 +86,7 @@ func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) { client.ScriptRPC = pb.NewScriptServiceClient(client) client.UserRPC = pb.NewUserServiceClient(client) client.ClientAgentIPRPC = pb.NewClientAgentIPServiceClient(client) + client.AuthorityKeyRPC = pb.NewAuthorityKeyServiceClient(client) err := client.init() if err != nil {