diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/service/inbound.go | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/web/service/inbound.go b/web/service/inbound.go index 7afcb140..4f28af21 100644 --- a/web/service/inbound.go +++ b/web/service/inbound.go @@ -588,8 +588,12 @@ func (s *InboundService) DelInboundClient(inboundId int, clientId string) (bool, logger.Debug("Client deleted by api:", email) needRestart = false } else { - logger.Debug("Unable to del client by api:", err1) - needRestart = true + if strings.Contains(err1.Error(), fmt.Sprintf("User %s not found.", email)) { + logger.Debug("User is already deleted. Nothing to do more...") + } else { + logger.Debug("Error in deleting client by api:", err1) + needRestart = true + } } s.xrayApi.Close() } @@ -713,10 +717,14 @@ func (s *InboundService) UpdateInboundClient(data *model.Inbound, clientId strin if oldClients[clientIndex].Enable { err1 := s.xrayApi.RemoveUser(oldInbound.Tag, oldEmail) if err1 == nil { - logger.Debug("Old client deleted by api:", clients[0].Email) + logger.Debug("Old client deleted by api:", oldEmail) } else { - logger.Debug("Error in deleting client by api:", err1) - needRestart = true + if strings.Contains(err1.Error(), fmt.Sprintf("User %s not found.", oldEmail)) { + logger.Debug("User is already deleted. Nothing to do more...") + } else { + logger.Debug("Error in deleting client by api:", err1) + needRestart = true + } } } if clients[0].Enable { @@ -1037,12 +1045,8 @@ func (s *InboundService) disableInvalidInbounds(tx *gorm.DB) (bool, int64, error if err1 == nil { logger.Debug("Inbound disabled by api:", tag) } else { - 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 - } + logger.Debug("Error in disabling inbound by api:", err1) + needRestart = true } } s.xrayApi.Close() |