|
@@ -510,7 +510,7 @@ func (s *ClientService) Delete(inboundSvc *InboundService, id int, keepTraffic b
|
|
|
if existing.Email == "" {
|
|
if existing.Email == "" {
|
|
|
continue
|
|
continue
|
|
|
}
|
|
}
|
|
|
- nr, delErr := s.DelInboundClientByEmail(inboundSvc, ibId, existing.Email, false, true)
|
|
|
|
|
|
|
+ nr, delErr := s.DelInboundClientByEmail(inboundSvc, ibId, existing.Email, keepTraffic, true)
|
|
|
if delErr != nil {
|
|
if delErr != nil {
|
|
|
// The client is already absent from this inbound (data drift or a
|
|
// The client is already absent from this inbound (data drift or a
|
|
|
// retried delete). Skip it — deletion stays idempotent.
|
|
// retried delete). Skip it — deletion stays idempotent.
|
|
@@ -678,7 +678,7 @@ func (s *ClientService) DeleteByEmail(inboundSvc *InboundService, email string,
|
|
|
needRestart := false
|
|
needRestart := false
|
|
|
var delErrs []error
|
|
var delErrs []error
|
|
|
for _, ibId := range inboundIds {
|
|
for _, ibId := range inboundIds {
|
|
|
- nr, delErr := s.DelInboundClientByEmail(inboundSvc, ibId, email, false, true)
|
|
|
|
|
|
|
+ nr, delErr := s.DelInboundClientByEmail(inboundSvc, ibId, email, keepTraffic, true)
|
|
|
if delErr != nil {
|
|
if delErr != nil {
|
|
|
if errors.Is(delErr, ErrClientNotInInbound) {
|
|
if errors.Is(delErr, ErrClientNotInInbound) {
|
|
|
continue
|
|
continue
|