Merge pull request #1996 from slntopp/dev

Dev
slntopp · Feb 10, 2025 · 5c1a5cd · 5c1a5cd
2 parents 26af7b1 + 1122063
commit 5c1a5cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/graph/migrations/invoices.go b/pkg/graph/migrations/invoices.go
@@ -92,7 +92,8 @@ func MigrateOldInvoicesToNew(log *zap.Logger, invoices driver.Collection, transa
 	invTypes := make(map[string]string)
 	file, err := os.Open(whmcsInvoicesFile)
 	if err != nil {
-		log.Fatal("Error migrating old invoices to new", zap.Error(err))
+		log.Error("Error migrating old invoices to new", zap.Error(err))
+		return
 	}
 	defer file.Close()
 	csvReader := csv.NewReader(file)
@@ -115,7 +116,8 @@ func MigrateOldInvoicesToNew(log *zap.Logger, invoices driver.Collection, transa
 	invInstances := make(map[string][]string)
 	file, err = os.Open(whmcsInstancesFile)
 	if err != nil {
-		log.Fatal("Error migrating old invoices to new", zap.Error(err))
+		log.Error("Error migrating old invoices to new", zap.Error(err))
+		return
 	}
 	defer file.Close()
 	csvReader = csv.NewReader(file)

diff --git a/pkg/registry/accounts.go b/pkg/registry/accounts.go
@@ -260,7 +260,6 @@ func (s *AccountsServiceServer) Get(ctx context.Context, request *accountspb.Get
 
 	log.Debug("Retrieving account", zap.String("uuid", requested))
 	acc, err := s.ctrl.GetWithAccess(ctx, requestorId, requested)
-
 	if err != nil || acc.Access == nil {
 		log.Debug("Error getting account", zap.Any("error", err))
 		return nil, status.Error(codes.NotFound, "Account not found")