From 8aa373b969aa358934309ffcd7f217e2b43c2b77 Mon Sep 17 00:00:00 2001
From: Max <shadow.iqka@qq.com>
Date: Wed, 24 Dec 2025 09:51:05 +0800
Subject: [PATCH] Refactor Logging in Mail Receiver to Use Structured Logging

- Replaced standard log statements with structured logging using the kun/log package for improved log clarity and consistency.
- Updated log messages in the MailReceiver to include contextual information, enhancing the ability to trace issues during email processing.
- This change aims to provide better insights into the email receiver's operations and error handling.
---
 messenger/providers/mailer/mailer_receive.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/messenger/providers/mailer/mailer_receive.go b/messenger/providers/mailer/mailer_receive.go
index e99119ab..40cc41ad 100644
--- a/messenger/providers/mailer/mailer_receive.go
+++ b/messenger/providers/mailer/mailer_receive.go
@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"fmt"
 	"io"
-	"log"
 	"mime"
 	"mime/multipart"
 	"net/mail"
@@ -14,6 +13,7 @@ import (
 
 	"github.com/emersion/go-imap"
 	"github.com/emersion/go-imap/client"
+	"github.com/yaoapp/kun/log"
 	"github.com/yaoapp/yao/messenger/types"
 )
 
@@ -118,10 +118,10 @@ func (r *MailReceiver) startReceiving(ctx context.Context) {
 	for retry := 0; retry < maxRetries; retry++ {
 		select {
 		case <-ctx.Done():
-			log.Println("Context cancelled, stopping email receiver")
+			log.Info("[Messenger] Context cancelled, stopping email receiver")
 			return
 		case <-r.stopChan:
-			log.Println("Stop signal received, stopping email receiver")
+			log.Info("[Messenger] Stop signal received, stopping email receiver")
 			return
 		default:
 		}
@@ -129,7 +129,7 @@ func (r *MailReceiver) startReceiving(ctx context.Context) {
 		// Reconnect if needed
 		if r.client == nil || r.client.State() != imap.SelectedState {
 			if err := r.reconnect(); err != nil {
-				log.Printf("Failed to reconnect to IMAP server: %v", err)
+				log.Error("[Messenger] Failed to reconnect to IMAP server: %v", err)
 				if retry < maxRetries-1 {
 					time.Sleep(retryDelay)
 					retryDelay *= 2 // Exponential backoff
@@ -142,7 +142,7 @@ func (r *MailReceiver) startReceiving(ctx context.Context) {
 		// Select mailbox
 		_, err := r.client.Select(r.provider.imapMailbox, false)
 		if err != nil {
-			log.Printf("Failed to select mailbox %s: %v", r.provider.imapMailbox, err)
+			log.Error("[Messenger] Failed to select mailbox %s: %v", r.provider.imapMailbox, err)
 			if retry < maxRetries-1 {
 				time.Sleep(retryDelay)
 				retryDelay *= 2
@@ -266,7 +266,7 @@ func (r *MailReceiver) processNewMessages() {
 
 	uids, err := r.client.UidSearch(criteria)
 	if err != nil {
-		log.Printf("Failed to search for new messages: %v", err)
+		log.Error("[Messenger] Failed to search for new messages: %v", err)
 		return
 	}
 
@@ -318,7 +318,7 @@ func (r *MailReceiver) processNewMessages() {
 
 		if shouldProcess {
 			if err := r.processMessage(msg); err != nil {
-				log.Printf("Failed to process message UID %d: %v", msg.Uid, err)
+				log.Error("[Messenger] Failed to process message UID %d: %v", msg.Uid, err)
 			} else {
 				processedCount++
 			}
@@ -331,7 +331,7 @@ func (r *MailReceiver) processNewMessages() {
 	}
 
 	if err := <-done; err != nil {
-		log.Printf("Failed to fetch messages: %v", err)
+		log.Error("[Messenger] Failed to fetch messages: %v", err)
 		return
 	}
 }