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

fix(notify): use AfterSend for contact with succuessful sending

Browse Source
This commit is contained in:
rainzm
2020-09-03 15:08:13 +08:00
parent 7a0eb06df9
commit 9978f19542
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/notify/tasks/notifications_send_task.go
+5 -1
View File
@@ -132,6 +132,11 @@ func (self *NotificationSendTask) OnInit(ctx context.Context, obj db.IStandalone
rn := contactMap[fd.Contact]
rn.AfterSend(ctx, false, fd.Reason)
failedRecord = append(failedRecord, fmt.Sprintf("%s: %s", rn.ReceiverID, fd.Reason))
delete(contactMap, fd.Contact)
}
// after send for successful notify
for _, rn := range contactMap {
rn.AfterSend(ctx, true, "")
}
if len(failedRecord) == len(contacts) {
self.taskFailed(ctx, notification, strings.Join(failedRecord, "; "), true)
@@ -141,7 +146,6 @@ func (self *NotificationSendTask) OnInit(ctx context.Context, obj db.IStandalone
self.taskFailed(ctx, notification, strings.Join(failedRecord, "; "), false)
return
}
log.Infof("successfully send notification %q", notification.GetId())
notification.SetStatus(self.UserCred, apis.NOTIFICATION_STATUS_OK, "")
logclient.AddActionLogWithContext(ctx, notification, logclient.ACT_SEND_NOTIFICATION, "", self.UserCred, true)
self.SetStageComplete(ctx, nil)