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

internal/tasks/event_looper.go

@@ -4,50 +4,41 @@ import (
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	"github.com/TeaOSLab/EdgeAPI/internal/goman"
 	"github.com/iwind/TeaGo/dbs"
-	"github.com/iwind/TeaGo/logs"
 	"time"
 )
 
 func init() {
 	dbs.OnReadyDone(func() {
-		looper := NewEventLooper()
 		goman.New(func() {
-			looper.Start()
+			NewEventLooper(2 * time.Second).Start()
 		})
 	})
 }
 
 // EventLooper 事件相关处理程序
 type EventLooper struct {
+	BaseTask
+
+	ticker *time.Ticker
 }
 
-func NewEventLooper() *EventLooper {
-	return &EventLooper{}
+func NewEventLooper(duration time.Duration) *EventLooper {
+	return &EventLooper{
+		ticker: time.NewTicker(duration),
+	}
 }
 
 func (this *EventLooper) Start() {
-	ticker := time.NewTicker(2 * time.Second)
-	for range ticker.C {
-		err := this.loop()
+	for range this.ticker.C {
+		err := this.Loop()
 		if err != nil {
-			logs.Println("[EVENT_LOOPER]" + err.Error())
+			this.logErr("EventLooper", err.Error())
 		}
 	}
 }
 
-func (this *EventLooper) loop() error {
-	lockerKey := "eventLooper"
-	isOk, err := models.SharedSysLockerDAO.Lock(nil, lockerKey, 3600)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		err = models.SharedSysLockerDAO.Unlock(nil, lockerKey)
-		if err != nil {
-			logs.Println("[EVENT_LOOPER]" + err.Error())
-		}
-	}()
-	if !isOk {
+func (this *EventLooper) Loop() error {
+	if !models.SharedAPINodeDAO.CheckAPINodeIsPrimaryWithoutErr() {
 		return nil
 	}
 
@@ -58,12 +49,12 @@ func (this *EventLooper) loop() error {
 	for _, eventOne := range events {
 		event, err := eventOne.DecodeEvent()
 		if err != nil {
-			logs.Println("[EVENT_LOOPER]" + err.Error())
+			this.logErr("EventLooper", err.Error())
 			continue
 		}
 		err = event.Run()
 		if err != nil {
-			logs.Println("[EVENT_LOOPER]" + err.Error())
+			this.logErr("EventLooper", err.Error())
 			continue
 		}
 		err = models.SharedSysEventDAO.DeleteEvent(nil, int64(eventOne.Id))