Merge pull request #1993 from slntopp/dev

fix
slntopp · Feb 6, 2025 · e4ff89f · e4ff89f
2 parents dce270a + a1062cb
commit e4ff89f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pkg/billing/cron.go b/pkg/billing/cron.go
@@ -17,6 +17,7 @@ import (
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
@@ -207,7 +208,7 @@ func (s *BillingServiceServer) dailyCronJobAction(ctx context.Context, log *zap.
 	log = log.Named("Action")
 	defer func() {
 		if err := recover(); err != nil {
-			log.Error("Recovered from panic", zap.Any("err", err))
+			log.Error("Recovered from panic", zap.Any("err", err), zap.String("stacktrace", string(debug.Stack())))
 		}
 	}()
 	// Jobs

diff --git a/pkg/billing/cron_delete_orphan_vpn_instances.go b/pkg/billing/cron_delete_orphan_vpn_instances.go
@@ -46,10 +46,16 @@ func (s *BillingServiceServer) DeleteOrphanVPNInstances(ctx context.Context, log
 		}
 		inst := obj.Instance
 		log := log.With(zap.String("instance", inst.GetUuid()))
+		if inst.GetStatus() == statuspb.NoCloudStatus_DEL {
+			continue
+		}
 		if inst.BillingPlan == nil || inst.Config == nil {
 			continue
 		}
 		plan := plans[inst.GetBillingPlan().GetUuid()]
+		if plan == nil {
+			continue
+		}
 		if strings.ToLower(plan.Type) != "vpn" {
 			continue
 		}

diff --git a/pkg/billing/cron_send_services_data.go b/pkg/billing/cron_send_services_data.go
@@ -440,7 +440,7 @@ func formatWhmcsLastLogin(data string) (date string, ip string, host string) {
 		} else if strings.HasPrefix(strings.TrimSpace(part), "IP Address:") {
 			ip = strings.TrimSpace(strings.TrimPrefix(strings.TrimSpace(part), "IP Address:"))
 		} else if strings.HasPrefix(strings.TrimSpace(part), "Host:") {
-			ip = strings.TrimSpace(strings.TrimPrefix(strings.TrimSpace(part), "Host:"))
+			host = strings.TrimSpace(strings.TrimPrefix(strings.TrimSpace(part), "Host:"))
 		}
 	}
 	return