diff --git a/internal/nodes/node.go b/internal/nodes/node.go index 463fe18..ad7922d 100644 --- a/internal/nodes/node.go +++ b/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 + } } } diff --git a/internal/nodes/node_ext.go b/internal/nodes/node_ext.go new file mode 100644 index 0000000..49c0633 --- /dev/null +++ b/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 +} diff --git a/internal/nodes/task_ocsp_update.go b/internal/nodes/task_ocsp_update.go index 1578b36..9e7bd16 100644 --- a/internal/nodes/task_ocsp_update.go +++ b/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, }) diff --git a/internal/rpc/rpc_client.go b/internal/rpc/rpc_client.go index c20ea60..e23fd3e 100644 --- a/internal/rpc/rpc_client.go +++ b/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()) } diff --git a/internal/waf/action_notify.go b/internal/waf/action_notify.go index 766f6c8..d2bc6b4 100644 --- a/internal/waf/action_notify.go +++ b/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,