diff options
| author | Alireza Ahmadi <alireza7@gmail.com> | 2024-10-10 18:37:06 +0300 |
|---|---|---|
| committer | Alireza Ahmadi <alireza7@gmail.com> | 2024-10-10 18:37:06 +0300 |
| commit | 1454c4ebc53027df757f92e9d6d205a82b7db559 (patch) | |
| tree | c13ce2e2bbcf0ea90be40d1482a9e783a54211f9 /web | |
| parent | 4b1c76e97252c5bcc7a9ee16b8bd0dde693cabbb (diff) | |
[bug] fix restarting core on disabling depleted user
Diffstat (limited to 'web')
| -rw-r--r-- | web/service/inbound.go | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/web/service/inbound.go b/web/service/inbound.go index 1450dd57..60530143 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -1037,8 +1037,12 @@ func (s *InboundService) disableInvalidInbounds(tx *gorm.DB) (bool, int64, error if err1 == nil { logger.Debug("Inbound disabled by api:", tag) } else { - logger.Debug("Error in disabling inbound by api:", err1) - needRestart = true + if strings.Contains(err1.Error(), fmt.Sprintf("User %s not found.", tag)) { + logger.Debug("User is already disabled. Nothing to do more...") + } else { + logger.Debug("Error in disabling client by api:", err1) + needRestart = true + } } } s.xrayApi.Close() @@ -1076,8 +1080,16 @@ func (s *InboundService) disableInvalidClients(tx *gorm.DB) (bool, int64, error) if err1 == nil { logger.Debug("Client disabled by api:", result.Email) } else { - logger.Debug("Error in disabling client by api:", err1) - needRestart = true + if strings.Contains(err1.Error(), fmt.Sprintf("User %s not found.", result.Email)) { + logger.Debug("User is already disabled. Nothing to do more...") + } else { + if strings.Contains(err1.Error(), fmt.Sprintf("User %s not found.", result.Email)) { + logger.Debug("User is already disabled. Nothing to do more...") + } else { + logger.Debug("Error in disabling client by api:", err1) + needRestart = true + } + } } } s.xrayApi.Close() |