优化代码

internal/nodes/node.go

@@ -333,6 +333,21 @@ func (this *Node) loop() error {
 			goman.New(func() {
 				sharedUpgradeManager.Start()
 			})
+		case "scriptsChanged":
+			err = this.reloadCommonScripts()
+			if err != nil {
+				return errors.New("reload common scripts failed: " + err.Error())
+			}
+
+			// 修改为已同步
+			_, err = rpcClient.NodeTaskRPC().ReportNodeTaskDone(nodeCtx, &pb.ReportNodeTaskDoneRequest{
+				NodeTaskId: task.Id,
+				IsOk:       true,
+				Error:      "",
+			})
+			if err != nil {
+				return err
+			}
 		}
 	}
 

internal/nodes/node_ext.go

@@ -0,0 +1,9 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+//go:build community
+// +build community
+
+package nodes
+
+func (this *Node) reloadCommonScripts() error {
+	return nil
+}

internal/nodes/task_ocsp_update.go

@@ -60,7 +60,7 @@ func (this *OCSPUpdateTask) Loop() error {
 		return err
 	}
 
-	resp, err := rpcClient.SSLCertService().ListUpdatedSSLCertOCSP(rpcClient.Context(), &pb.ListUpdatedSSLCertOCSPRequest{
+	resp, err := rpcClient.SSLCertRPC().ListUpdatedSSLCertOCSP(rpcClient.Context(), &pb.ListUpdatedSSLCertOCSPRequest{
 		Version: this.version,
 		Size:    100,
 	})

internal/rpc/rpc_client.go

@@ -135,11 +135,11 @@ func (this *RPCClient) MetricStatRPC() pb.MetricStatServiceClient {
 	return pb.NewMetricStatServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) FirewallService() pb.FirewallServiceClient {
+func (this *RPCClient) FirewallRPC() pb.FirewallServiceClient {
 	return pb.NewFirewallServiceClient(this.pickConn())
 }
 
-func (this *RPCClient) SSLCertService() pb.SSLCertServiceClient {
+func (this *RPCClient) SSLCertRPC() pb.SSLCertServiceClient {
 	return pb.NewSSLCertServiceClient(this.pickConn())
 }
 

internal/waf/action_notify.go

@@ -34,7 +34,7 @@ func init() {
 			}
 
 			for task := range notifyChan {
-				_, err = rpcClient.FirewallService().NotifyHTTPFirewallEvent(rpcClient.Context(), &pb.NotifyHTTPFirewallEventRequest{
+				_, err = rpcClient.FirewallRPC().NotifyHTTPFirewallEvent(rpcClient.Context(), &pb.NotifyHTTPFirewallEventRequest{
 					ServerId:                task.ServerId,
 					HttpFirewallPolicyId:    task.HttpFirewallPolicyId,
 					HttpFirewallRuleGroupId: task.HttpFirewallRuleGroupId,