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): show pretty notify error (#21533)

Browse Source
This commit is contained in:
屈轩
2024-11-06 10:05:13 +08:00
committed by GitHub
parent be112dd6cc
commit bb1d55b944
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/notify/models/notification.go
+1 -4
View File
@@ -212,10 +212,7 @@ func (nm *SNotificationManager) PerformEventNotify(ctx context.Context, userCred
topic, err := TopicManager.TopicByEvent(input.Event)
if err != nil {
return output, errors.Wrapf(err, "unable fetch subscriptions by event %q", input.Event)
}
if topic == nil {
return output, nil
return output, errors.Wrapf(err, "TopicByEvent")
}
receiverIds := make(map[string]uint32)
receiverIds1, err := SubscriberManager.getReceiversSent(ctx, topic.Id, input.ProjectDomainId, input.ProjectId)
pkg/notify/models/topic.go
+10 -20
View File
@@ -20,7 +20,6 @@ import (
"strings"
"sync"
"yunion.io/x/cloudmux/pkg/cloudprovider"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
@@ -740,7 +739,7 @@ func (sm *STopicManager) GetTopicsByEvent(resourceType string, action notify.SAc
return topics, err
}
func (sm *STopicManager) TopicsByEvent(eventStr string) ([]STopic, error) {
func (manager *STopicManager) TopicByEvent(eventStr string) (*STopic, error) {
event, err := parseEvent(eventStr)
if err != nil {
return nil, errors.Wrapf(err, "unable to parse event %q", event)
@@ -755,21 +754,26 @@ func (sm *STopicManager) TopicsByEvent(eventStr string) ([]STopic, error) {
log.Warningf("unknown action type: %s", event.Action())
return nil, nil
}
q := sm.Query()
q := manager.Query()
if event.Result() == api.ResultSucceed {
q = q.Equals("results", true)
} else {
q = q.Equals("results", false)
}
q = q.Equals("enabled", true)
q = q.Filter(sqlchemy.GT(sqlchemy.AND_Val("", q.Field("resources"), 1<<resourceV), 0))
q = q.Filter(sqlchemy.GT(sqlchemy.AND_Val("", q.Field("actions"), 1<<actionV), 0))
var topics []STopic
err = db.FetchModelObjects(sm, q, &topics)
err = db.FetchModelObjects(manager, q, &topics)
if err != nil {
return nil, errors.Wrap(err, "unable to FetchModelObjects")
}
return topics, nil
for i := range topics {
if topics[i].Enabled.IsFalse() {
return nil, errors.Wrapf(errors.ErrInvalidStatus, "topic %s disabled", eventStr)
}
return &topics[i], nil
}
return nil, errors.Wrapf(errors.ErrNotFound, "topic %s", eventStr)
}
func (t *STopic) PreCheckPerformAction(
@@ -987,17 +991,3 @@ func (self *STopic) GetEnabledSubscribers(domainId, projectId string) ([]SSubscr
err := db.FetchModelObjects(SubscriberManager, q, &ret)
return ret, err
}
func (sm *STopicManager) TopicByEvent(eventStr string) (*STopic, error) {
topics, err := sm.TopicsByEvent(eventStr)
if err != nil {
return nil, err
}
if len(topics) == 1 {
return &topics[0], nil
}
if len(topics) == 0 {
return nil, errors.Wrapf(cloudprovider.ErrNotFound, "eventStr:%s", eventStr)
}
return nil, errors.Wrapf(cloudprovider.ErrDuplicateId, "eventStr:%s", eventStr)
}