fix(send_queue): 修复已投递标记恢复逻辑
- 新增投递标记文件持久化,避免重启后重复发送已投递的队列项。 - 在恢复卡住的发送任务时,识别已存在的投递标记并直接修复数据库状态。 - 同步补充回归测试,覆盖陈旧投递标记不应触发重发的场景。
This commit is contained in:
@@ -975,6 +975,61 @@ func TestSendQueueRecoversStaleSendingItems(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSendQueueStaleDeliveredMarkerDoesNotRedeliver(t *testing.T) {
|
||||
a := newTestApp(t)
|
||||
host, port, received := startCapturingSMTP(t, 1)
|
||||
a.cfg.SMTPHost = host
|
||||
a.cfg.SMTPPort = port
|
||||
user, mb := defaultAdminUserAndMailbox(t, a)
|
||||
now := a.now().UTC()
|
||||
mimeBytes := []byte("From: admin@lanqin.local\r\nTo: person@example.com\r\nSubject: marker\r\n\r\nbody")
|
||||
queueID, err := a.enqueueSend(context.Background(), sendQueueInput{
|
||||
UserID: user.ID,
|
||||
MailboxID: mb.ID,
|
||||
Source: sendSourceWebmail,
|
||||
MailFrom: mb.Address,
|
||||
HeaderFrom: mb.Address,
|
||||
Recipients: []string{"person@example.com"},
|
||||
MIMEBytes: mimeBytes,
|
||||
Now: now,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
staleAt := now.Add(-sendQueueStaleAfter - time.Minute).Format(time.RFC3339Nano)
|
||||
if _, err := a.db.Exec(`UPDATE send_queue SET status=?,attempt_count=1,updated_at=? WHERE id=?`, sendQueueStatusSending, staleAt, queueID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := a.writeSendQueueDeliveredMarker(queueID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := a.processDueSendQueue(context.Background()); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
select {
|
||||
case body := <-received:
|
||||
t.Fatalf("stale delivered marker should not redeliver, got %q", body)
|
||||
case <-time.After(200 * time.Millisecond):
|
||||
}
|
||||
var status, mimeBase64 string
|
||||
if err := a.db.QueryRow(`SELECT status,mime_base64 FROM send_queue WHERE id=?`, queueID).Scan(&status, &mimeBase64); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if status != sendQueueStatusDelivered {
|
||||
t.Fatalf("queue status=%q, want delivered", status)
|
||||
}
|
||||
if mimeBase64 != "" {
|
||||
t.Fatal("delivered marker recovery should clear raw MIME")
|
||||
}
|
||||
delivered, err := a.hasSendQueueDeliveredMarker(queueID)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if delivered {
|
||||
t.Fatal("delivered marker should be removed after database state is repaired")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSubmissionAuthRequiresMailboxPasswordAndSendPermission(t *testing.T) {
|
||||
a := newTestApp(t)
|
||||
user, mailbox, err := a.authenticateSubmission(context.Background(), "admin@lanqin.local", "ChangeMe123!")
|
||||
|
||||
Reference in New Issue
Block a user