Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3f1a08374e |
@@ -1,18 +1,32 @@
|
||||
package logger
|
||||
|
||||
import (
|
||||
"go.uber.org/zap"
|
||||
"log"
|
||||
"time"
|
||||
|
||||
"go.uber.org/zap"
|
||||
"go.uber.org/zap/zapcore"
|
||||
)
|
||||
|
||||
var Logger *zap.Logger
|
||||
|
||||
func init() {
|
||||
logger, err := zap.NewProduction()
|
||||
// Create a production config and customize the time encoder
|
||||
config := zap.NewProductionConfig()
|
||||
config.EncoderConfig.EncodeTime = BeijingTimeEncoder
|
||||
|
||||
// Build the logger with the custom config
|
||||
logger, err := config.Build()
|
||||
if err != nil {
|
||||
log.Fatalf("cannot init zap logger: %+v", err)
|
||||
}
|
||||
|
||||
Logger = logger
|
||||
}
|
||||
|
||||
// BeijingTimeEncoder formats time in Beijing timezone
|
||||
func BeijingTimeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
|
||||
// Set timezone to Beijing (UTC+8)
|
||||
beijingLoc, _ := time.LoadLocation("Asia/Shanghai")
|
||||
enc.AppendString(t.In(beijingLoc).Format("2006-01-02 15:04:05"))
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@ import (
|
||||
"likedream-goframe/internal/framework/logger"
|
||||
"likedream-goframe/internal/framework/model/email"
|
||||
"likedream-goframe/internal/utils"
|
||||
"runtime/debug"
|
||||
|
||||
"github.com/hibiken/asynq"
|
||||
"github.com/samber/oops"
|
||||
@@ -21,18 +20,18 @@ type EmailTaskHandler struct {
|
||||
func (h *EmailTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task) (err error) {
|
||||
defer utils.Pass(&err)
|
||||
var payload email.SendPayload
|
||||
e := gob.NewDecoder(bytes.NewReader(task.Payload())).Decode(&payload)
|
||||
utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
|
||||
logger.Logger.Info("开始处理邮件发送", zap.String("邮箱", payload.To))
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
// 打印日志
|
||||
logger.Logger.Error("邮件发送失败", zap.String("邮箱", payload.To), zap.Error(r.(error)), zap.Stack(string(debug.Stack())))
|
||||
logger.Logger.Error("邮件发送失败", zap.String("邮箱", payload.To), zap.Error(r.(error)))
|
||||
// 重新抛出相同的 panic
|
||||
panic(r)
|
||||
}
|
||||
}()
|
||||
|
||||
e := gob.NewDecoder(bytes.NewReader(task.Payload())).Decode(&payload)
|
||||
utils.OkOrPanic(e, oops.WithContext(ctx).Wrap)
|
||||
|
||||
message := mail.NewMsg()
|
||||
|
||||
e = message.FromFormat(payload.FromName, payload.FromEmail)
|
||||
|
||||
Reference in New Issue
Block a user