Merge pull request #1992 from slntopp/dev

Dev
slntopp · Feb 5, 2025 · dce270a · dce270a
2 parents 5c813bf + 50fa256
commit dce270a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/billing/cron.go b/pkg/billing/cron.go
@@ -211,12 +211,12 @@ func (s *BillingServiceServer) dailyCronJobAction(ctx context.Context, log *zap.
 		}
 	}()
 	// Jobs
-	s.DeleteOrphanVPNInstances(ctx, log)
 	s.InvoiceExpiringInstancesCronJob(ctx, log)
 	s.NotifyToUpdateOvhPricesCronJob(ctx, log)
 	s.DeleteExpiredBalanceInvoicesCronJob(ctx, log)
 	s.WhmcsInvoicesSyncerCronJob(ctx, log)
 	s.CollectSystemReport(ctx, log)
+	s.DeleteOrphanVPNInstances(ctx, log)
 }
 
 func (s *BillingServiceServer) cronPreflightChecks(ctx context.Context, log *zap.Logger) error {

diff --git a/pkg/billing/cron_delete_orphan_vpn_instances.go b/pkg/billing/cron_delete_orphan_vpn_instances.go
@@ -34,10 +34,16 @@ func (s *BillingServiceServer) DeleteOrphanVPNInstances(ctx context.Context, log
 		return
 	}
 	for _, p := range _plans {
+		if p == nil {
+			continue
+		}
 		plans[p.Key] = p
 	}
 
 	for _, obj := range resp.Msg.Pool {
+		if obj == nil || obj.Instance == nil {
+			continue
+		}
 		inst := obj.Instance
 		log := log.With(zap.String("instance", inst.GetUuid()))
 		if inst.BillingPlan == nil || inst.Config == nil {
@@ -52,7 +58,7 @@ func (s *BillingServiceServer) DeleteOrphanVPNInstances(ctx context.Context, log
 			continue
 		}
 		linkedInstance, err := s.instances.Get(ctx, linked)
-		if err != nil {
+		if err != nil || linkedInstance == nil {
 			log.Error("Failed to get linked vpn instance", zap.Error(err))
 			continue
 		}