From ebb4c483d03b9b9daeb083b5d0e1b24f5d721ff2 Mon Sep 17 00:00:00 2001 From: lolka1333 Date: Tue, 5 May 2026 14:16:06 +0200 Subject: [PATCH] fix: --- web/job/xray_traffic_job.go | 2 +- web/service/inbound.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/job/xray_traffic_job.go b/web/job/xray_traffic_job.go index 063b20dd..f3b04868 100644 --- a/web/job/xray_traffic_job.go +++ b/web/job/xray_traffic_job.go @@ -35,7 +35,7 @@ func (j *XrayTrafficJob) Run() { if err != nil { return } - err, needRestart0, clientsDisabled := j.inboundService.AddTraffic(traffics, clientTraffics) + needRestart0, clientsDisabled, err := j.inboundService.AddTraffic(traffics, clientTraffics) if err != nil { logger.Warning("add inbound traffic failed:", err) } diff --git a/web/service/inbound.go b/web/service/inbound.go index 2e047a4f..99fc13a8 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -1317,7 +1317,7 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin return needRestart, tx.Save(oldInbound).Error } -func (s *InboundService) AddTraffic(inboundTraffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (error, bool, bool) { +func (s *InboundService) AddTraffic(inboundTraffics []*xray.Traffic, clientTraffics []*xray.ClientTraffic) (bool, bool, error) { var err error db := database.GetDB() tx := db.Begin() @@ -1331,11 +1331,11 @@ func (s *InboundService) AddTraffic(inboundTraffics []*xray.Traffic, clientTraff }() err = s.addInboundTraffic(tx, inboundTraffics) if err != nil { - return err, false, false + return false, false, err } err = s.addClientTraffic(tx, clientTraffics) if err != nil { - return err, false, false + return false, false, err } needRestart0, count, err := s.autoRenewClients(tx) @@ -1360,7 +1360,7 @@ func (s *InboundService) AddTraffic(inboundTraffics []*xray.Traffic, clientTraff } else if count > 0 { logger.Debugf("%v inbounds disabled", count) } - return nil, (needRestart0 || needRestart1 || needRestart2), disabledClientsCount > 0 + return needRestart0 || needRestart1 || needRestart2, disabledClientsCount > 0, nil } func (s *InboundService) addInboundTraffic(tx *gorm.DB, traffics []*xray.Traffic) error {