From 554c4332c442b79735c303d84361ebf0f84b2edc Mon Sep 17 00:00:00 2001 From: Nityananda Gohain Date: Mon, 5 Feb 2024 20:23:20 +0530 Subject: [PATCH] fix: don't throw error while fetching orgname (#4496) * fix: don't throw error while fetching orgname * fix: don't ignore the error --- ee/query-service/usage/manager.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ee/query-service/usage/manager.go b/ee/query-service/usage/manager.go index 28d4e3020e..99158b4345 100644 --- a/ee/query-service/usage/manager.go +++ b/ee/query-service/usage/manager.go @@ -139,17 +139,13 @@ func (lm *Manager) UploadUsage() { zap.S().Info("uploading usage data") - // Try to get the org name orgName := "" - orgNames, err := lm.modelDao.GetOrgs(ctx) - if err != nil { - zap.S().Errorf("failed to get org data: %v", zap.Error(err)) - } else { - if len(orgNames) != 1 { - zap.S().Errorf("expected one org but got %d orgs", len(orgNames)) - } else { - orgName = orgNames[0].Name - } + orgNames, orgError := lm.modelDao.GetOrgs(ctx) + if orgError != nil { + zap.S().Errorf("failed to get org data: %v", zap.Error(orgError)) + } + if len(orgNames) == 1 { + orgName = orgNames[0].Name } usagesPayload := []model.Usage{}