xinyin025/one-api
1
0
Fork 0
mirror of https://github.com/songquanpeng/one-api.git synced 2025-09-21 19:16:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #35 from myronzhangweb3/fix-send-msg

Browse Source 
Fix send msg
This commit is contained in:
Laisky.Cai 2025-03-09 20:48:32 +08:00 committed by GitHub
commit b5a242da15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/message/main.go
View File

@ -12,6 +12,22 @@ const (
) )
func Notify(by string, title string, description string, content string) error { func Notify(by string, title string, description string, content string) error {
if by == ByAll {
var errMsgs []string
if err := SendEmail(title, config.RootUserEmail, content); err != nil {
errMsgs = append(errMsgs, fmt.Sprintf("failed to send email: %v", err))
}
if err := SendMessage(title, description, content); err != nil {
errMsgs = append(errMsgs, fmt.Sprintf("failed to send message: %v", err))
}
if len(errMsgs) > 0 {
return fmt.Errorf("multiple errors occurred: %v", errMsgs)
}
return nil
}
if by == ByEmail { if by == ByEmail {
return SendEmail(title, config.RootUserEmail, content) return SendEmail(title, config.RootUserEmail, content)
} }

2
controller/channel-test.go
View File

@ -270,7 +270,7 @@ func testChannels(ctx context.Context, notify bool, scope string) error {
if notify { if notify {
err := message.Notify(message.ByAll, "Channel test completed", "", "Channel test completed, if you have not received the disable notification, it means that all channels are normal") err := message.Notify(message.ByAll, "Channel test completed", "", "Channel test completed, if you have not received the disable notification, it means that all channels are normal")
if err != nil { if err != nil {
logger.SysError(fmt.Sprintf("failed to send email: %s", err.Error())) logger.SysError(fmt.Sprintf("failed to send notify: %s", err.Error()))
} }
} }
}() }()