优化任务Badge检查频率

internal/web/actions/default/clusters/tasks/check.go

@@ -3,23 +3,38 @@ package tasks
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"time"
 )
 
 type CheckAction struct {
 	actionutils.ParentAction
 }
 
-func (this *CheckAction) RunPost(params struct{}) {
+func (this *CheckAction) RunPost(params struct {
-	resp, err := this.RPC().NodeTaskRPC().ExistsNodeTasks(this.AdminContext(), &pb.ExistsNodeTasksRequest{
+	IsDoing   bool
-		ExcludeTypes: []string{"ipItemChanged"},
+	HasError  bool
-	})
+	IsUpdated bool
-	if err != nil {
+}) {
-		this.ErrorPage(err)
+	var maxTries = 10
-		return
+	for i := 0; i < maxTries; i++ {
-	}
+		resp, err := this.RPC().NodeTaskRPC().ExistsNodeTasks(this.AdminContext(), &pb.ExistsNodeTasksRequest{
+			ExcludeTypes: []string{"ipItemChanged"},
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
 
-	this.Data["isDoing"] = resp.ExistTasks
+		// 如果没有数据变化，继续查询
-	this.Data["hasError"] = resp.ExistError
+		if i < maxTries-1 && params.IsUpdated && resp.ExistTasks == params.IsDoing && resp.ExistError == params.HasError {
+			time.Sleep(3 * time.Second)
+			continue
+		}
+
+		this.Data["isDoing"] = resp.ExistTasks
+		this.Data["hasError"] = resp.ExistError
+		break
+	}
 
 	this.Success()
 }

internal/web/actions/default/dns/tasks/check.go

@@ -3,21 +3,36 @@ package tasks
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"time"
 )
 
 type CheckAction struct {
 	actionutils.ParentAction
 }
 
-func (this *CheckAction) RunPost(params struct{}) {
+func (this *CheckAction) RunPost(params struct {
-	resp, err := this.RPC().DNSTaskRPC().ExistsDNSTasks(this.AdminContext(), &pb.ExistsDNSTasksRequest{})
+	IsDoing   bool
-	if err != nil {
+	HasError  bool
-		this.ErrorPage(err)
+	IsUpdated bool
-		return
+}) {
-	}
+	var maxTries = 10
+	for i := 0; i < maxTries; i++ {
+		resp, err := this.RPC().DNSTaskRPC().ExistsDNSTasks(this.AdminContext(), &pb.ExistsDNSTasksRequest{})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
 
-	this.Data["isDoing"] = resp.ExistTasks
+		// 如果没有数据变化，继续查询
-	this.Data["hasError"] = resp.ExistError
+		if i < maxTries-1 && params.IsUpdated && resp.ExistTasks == params.IsDoing && resp.ExistError == params.HasError {
+			time.Sleep(3 * time.Second)
+			continue
+		}
+
+		this.Data["isDoing"] = resp.ExistTasks
+		this.Data["hasError"] = resp.ExistError
+		break
+	}
 
 	this.Success()
 }

web/views/@default/@layout.js

@@ -118,6 +118,12 @@ Tea.context(function () {
 			return
 		}
 		this.$post("/clusters/tasks/check")
+			.params({
+				isDoing: this.doingNodeTasks.isDoing ? 1 : 0,
+				hasError: this.doingNodeTasks.hasError ? 1 : 0,
+				isUpdated: this.doingNodeTasks.isUpdated ? 1 : 0
+			})
+			.timeout(60)
 			.success(function (resp) {
 				this.doingNodeTasks.isDoing = resp.data.isDoing
 				this.doingNodeTasks.hasError = resp.data.hasError
@@ -151,6 +157,12 @@ Tea.context(function () {
 			return
 		}
 		this.$post("/dns/tasks/check")
+			.params({
+				isDoing: this.doingDNSTasks.isDoing ? 1 : 0,
+				hasError: this.doingDNSTasks.hasError ? 1 : 0,
+				isUpdated: this.doingDNSTasks.isUpdated ? 1 : 0
+			})
+			.timeout(60)
 			.success(function (resp) {
 				this.doingDNSTasks.isDoing = resp.data.isDoing
 				this.doingDNSTasks.hasError = resp.data.hasError