多个API节点时选择一个作为主节点/优化任务相关代码

internal/tasks/node_task_extractor.go

@@ -5,49 +5,49 @@ import (
 	"github.com/TeaOSLab/EdgeAPI/internal/goman"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/iwind/TeaGo/dbs"
-	"github.com/iwind/TeaGo/logs"
 	"time"
 )
 
 func init() {
 	dbs.OnReadyDone(func() {
 		goman.New(func() {
-			NewNodeTaskExtractor().Start()
+			NewNodeTaskExtractor(10 * time.Second).Start()
 		})
 	})
 }
 
 // NodeTaskExtractor 节点任务
 type NodeTaskExtractor struct {
+	BaseTask
+
+	ticker *time.Ticker
 }
 
-func NewNodeTaskExtractor() *NodeTaskExtractor {
-	return &NodeTaskExtractor{}
+func NewNodeTaskExtractor(duration time.Duration) *NodeTaskExtractor {
+	return &NodeTaskExtractor{
+		ticker: time.NewTicker(duration),
+	}
 }
 
 func (this *NodeTaskExtractor) Start() {
-	ticker := time.NewTicker(10 * time.Second)
-	for range ticker.C {
+	for range this.ticker.C {
 		err := this.Loop()
 		if err != nil {
-			logs.Println("[TASK][NODE_TASK_EXTRACTOR]" + err.Error())
+			this.logErr("NodeTaskExtractor", err.Error())
 		}
 	}
 }
 
 func (this *NodeTaskExtractor) Loop() error {
-	ok, err := models.SharedSysLockerDAO.Lock(nil, "node_task_extractor", 10-1) // 假设执行时间为1秒
-	if err != nil {
-		return err
-	}
-	if !ok {
+	// 检查是否为主节点
+	if !models.SharedAPINodeDAO.CheckAPINodeIsPrimaryWithoutErr() {
 		return nil
 	}
 
 	// 这里不解锁，是为了让任务N秒钟之内只运行一次
 
 	for _, role := range []string{nodeconfigs.NodeRoleNode, nodeconfigs.NodeRoleDNS} {
-		err = models.SharedNodeTaskDAO.ExtractAllClusterTasks(nil, role)
+		err := models.SharedNodeTaskDAO.ExtractAllClusterTasks(nil, role)
 		if err != nil {
 			return err
 		}