opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16275 from gouqi11/fixNotifyEmailDoubleSend

Browse Source 
fix(notify): fix notify email double send
This commit is contained in:
Zexi Li
2023-03-22 20:38:45 +08:00
committed by GitHub
parent 42ec556bca af7259682a
commit 716ca349ac
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/notify/sender/email.go
+11 -10
View File
@@ -127,18 +127,19 @@ func (emailSender *SEmailSender) Send(args api.SendParams) error {
if len(retErr) > 0 {
log.Errorf("send email error:%v", jsonutils.Marshal(retErr))
}
} else {
// 构造email发送请求
gmsg := gomail.NewMessage()
gmsg.SetHeader("From", models.ConfigMap[api.EMAIL].Content.SenderAddress)
gmsg.SetHeader("To", args.Receivers.Contact)
gmsg.SetHeader("Subject", args.Title)
gmsg.SetBody("text/html", args.Message)
dialer.StartTLSPolicy = gomail.MandatoryStartTLS
if err := dialer.DialAndSend(gmsg); err != nil {
return errors.Wrap(err, "send email")
}
}
// 构造email发送请求
gmsg := gomail.NewMessage()
gmsg.SetHeader("From", models.ConfigMap[api.EMAIL].Content.SenderAddress)
gmsg.SetHeader("To", args.Receivers.Contact)
gmsg.SetHeader("Subject", args.Title)
gmsg.SetBody("text/html", args.Message)
dialer.StartTLSPolicy = gomail.MandatoryStartTLS
if err := dialer.DialAndSend(gmsg); err != nil {
return errors.Wrap(err, "send email")
}
return nil
}