修复一个长期导致队列堵塞的bug

rroy233 · rroy233 · commit 7fdb5ce5983d · 2024-03-12T11:10:46.000+08:00
其他细节优化
diff --git a/db/queue.go b/db/queue.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/google/uuid"
+	"gopkg.in/rroy233/logger.v2"
 	"sync"
 	"time"
 )
@@ -45,7 +46,7 @@ var queue *QStruct
 var maxQueueSize int
 var QueueTimeout int64
 
-const queueCleanerInterval = 30 * time.Second
+const queueCleanerInterval = 10 * time.Second
 
 func initQueue(maxSize int) {
 	if maxSize == 0 {
@@ -79,6 +80,13 @@ func queueCleaner() {
 			}
 		}
 		queue.lock.Unlock()
+
+		p := queue.head
+		for queue.data[p] != nil && queue.data[p].abort == true {
+			queue.pop()
+			p = (p + 1) % maxQueueSize
+		}
+
 		time.Sleep(queueCleanerInterval)
 	}
 }
@@ -180,22 +188,33 @@ func (q *QStruct) pop() *QItem {
 	q.data[q.head] = nil
 	q.size--
 	q.head = (q.head + 1) % maxQueueSize
+	if q.size == 0 {
+		q.head = 0
+		q.tail = 0
+	}
 	return item
 }
 
-func (q *QStruct) print() {
+func (q *QStruct) debugPrint() {
 	q.lock.Lock()
 	defer q.lock.Unlock()
-	fmt.Printf("[Size=%d,head=%d,tail=%d]->[\n", q.size, q.head, q.tail)
+	text := ""
+	text += fmt.Sprintf("[Size=%d,head=%d,tail=%d]->[\n", q.size, q.head, q.tail)
 	for i := 0; i < maxQueueSize; i++ {
-		fmt.Printf("\t")
+		text += fmt.Sprintf("\t")
 		if q.data[i] == nil {
-			fmt.Printf("<nil>")
+			text += fmt.Sprintf("<nil>")
 		} else {
-			fmt.Printf("UUID=%s\tUID=%d\tabort=%v", q.data[i].UUID, q.data[i].uid, q.data[i].abort)
+			text += fmt.Sprintf("UUID=%s\tUID=%d\tabort=%v\tadd_time=%d\tqueueIndex=%d",
+				q.data[i].UUID, q.data[i].uid, q.data[i].abort, q.data[i].addTime, q.data[i].queueIndex,
+			)
 		}
-		fmt.Printf("\n")
+		text += "\n"
+	}
+	if logger.Debug == nil {
+		logger.New(&logger.Config{StdOutput: true})
 	}
+	logger.Debug.Println(text)
 	return
 }
 
diff --git a/handler/AddStickerUrlMessage.go b/handler/AddStickerUrlMessage.go
@@ -32,7 +32,7 @@ func AddStickerUrlMessage(update tgbotapi.Update) {
 
 	//len equal to 0
 	if len(stickerSet.Stickers) == 0 {
-		logger.Error.Println(userInfo+"len(stickerSet.Stickers) == 0", utils.JsonEncode(stickerSet))
+		logger.Info.Println(userInfo+"len(stickerSet.Stickers) == 0", utils.JsonEncode(stickerSet))
 		utils.SendPlainText(&update, languages.Get(&update).BotMsg.ErrFailedToDownload)
 		return
 	}
diff --git a/handler/queue_op.go b/handler/queue_op.go
@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"errors"
 	"fmt"
 	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
 	"github.com/rroy233/StickerDownloader/db"
@@ -25,7 +26,8 @@ func enqueue(update *tgbotapi.Update, queueEditMsg *tgbotapi.Message) (*db.QItem
 	needRecover := false
 	qItem, err := db.EnQueue(utils.GetUID(update))
 	if err != nil {
-		if err == db.ErrorQueueFull {
+		if errors.Is(err, db.ErrorQueueFull) {
+			logger.Warn.Printf("[handler.enqueue]Queue is FULL! chatID:%d MsgID:%d", queueEditMsg.Chat.ID, queueEditMsg.MessageID)
 			utils.EditMsgText(queueEditMsg.Chat.ID, queueEditMsg.MessageID, languages.Get(update).BotMsg.ErrSysBusy)
 			return nil, true
 		}
diff --git a/main.go b/main.go
@@ -11,6 +11,7 @@ import (
 	"github.com/rroy233/StickerDownloader/statistics"
 	"github.com/rroy233/StickerDownloader/utils"
 	"gopkg.in/rroy233/logger.v2"
+	"log"
 	"os"
 	"os/signal"
 	"syscall"
@@ -25,6 +26,7 @@ var cancelCh chan int
 func main() {
 	//config
 	config.Init()
+	log.Println("[main]config=" + utils.JsonEncode(config.Get()))
 
 	//logger
 	logger.New(

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func AddStickerUrlMessage(update tgbotapi.Update) {`
`32`	`32`
`33`	`33`	`//len equal to 0`
`34`	`34`	`if len(stickerSet.Stickers) == 0 {`
`35`		`- logger.Error.Println(userInfo+"len(stickerSet.Stickers) == 0", utils.JsonEncode(stickerSet))`
	`35`	`+ logger.Info.Println(userInfo+"len(stickerSet.Stickers) == 0", utils.JsonEncode(stickerSet))`
`36`	`36`	`utils.SendPlainText(&update, languages.Get(&update).BotMsg.ErrFailedToDownload)`
`37`	`37`	`return`
`38`	`38`	`}`