xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-08-29 14:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(outbounds): propagate allocation query failures (#6208)

Browse Source 
* fix(outbounds): propagate allocation query failures

* test(outbounds): cover update allocation failure

---------

Co-authored-by: n0ctal <293235942+n0ctal@users.noreply.github.com>
This commit is contained in:
n0ctal
2026-08-14 22:41:24 +05:00
committed by GitHub
parent 20b3f84f77
commit b70c5abce8
2 changed files with 108 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/outbound_subscription.go
+16 -6
View File
@@ -156,10 +156,12 @@ func defaultPrefixNumber(subs []*model.OutboundSubscription, excludeId int) int
// nextDefaultSubPrefix builds the default "subN-" prefix for a new/edited
// subscription, picking the smallest free N (excludeId skips a subscription's
// own current prefix when editing).
func (s *OutboundSubscriptionService) nextDefaultSubPrefix(excludeId int) string {
func (s *OutboundSubscriptionService) nextDefaultSubPrefix(excludeId int) (string, error) {
var subs []*model.OutboundSubscription
_ = database.GetDB().Find(&subs).Error
return fmt.Sprintf("sub%d-", defaultPrefixNumber(subs, excludeId))
if err := database.GetDB().Find(&subs).Error; err != nil {
return "", err
}
return fmt.Sprintf("sub%d-", defaultPrefixNumber(subs, excludeId)), nil
}
func (s *OutboundSubscriptionService) Create(remark, rawURL, tagPrefix string, enabled bool, updateInterval int, allowPrivate, prepend, allowInsecure bool) (*model.OutboundSubscription, error) {
@@ -175,11 +177,16 @@ func (s *OutboundSubscriptionService) Create(remark, rawURL, tagPrefix string, e
}
prefix := strings.TrimSpace(tagPrefix)
if prefix == "" {
prefix = s.nextDefaultSubPrefix(0)
prefix, err = s.nextDefaultSubPrefix(0)
if err != nil {
return nil, err
}
}
// New subscriptions go to the end of the priority order.
var count int64
database.GetDB().Model(&model.OutboundSubscription{}).Count(&count)
if err := database.GetDB().Model(&model.OutboundSubscription{}).Count(&count).Error; err != nil {
return nil, err
}
sub := &model.OutboundSubscription{
Remark: strings.TrimSpace(remark),
Url: cleanURL,
@@ -215,7 +222,10 @@ func (s *OutboundSubscriptionService) Update(id int, remark, rawURL, tagPrefix s
}
prefix := strings.TrimSpace(tagPrefix)
if prefix == "" {
prefix = s.nextDefaultSubPrefix(sub.Id)
prefix, err = s.nextDefaultSubPrefix(sub.Id)
if err != nil {
return err
}
}
sub.Remark = strings.TrimSpace(remark)
sub.Url = cleanURL