GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 19:59:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: feature usage count (#2710)

Browse Source
This commit is contained in:
Vishal Sharma 2023-05-17 20:24:10 +05:30 committed by GitHub
parent 93c9138fe1
commit 7cb2399c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/query-service/app/dashboards/model.go
View File

@ -287,10 +287,10 @@ func updateFeatureUsage(fm interfaces.FeatureLookup, usage int64) *model.ApiErro
} }
} }
feature.Usage += usage feature.Usage += usage
if feature.Usage >= feature.UsageLimit { if feature.Usage >= feature.UsageLimit && feature.UsageLimit != -1 {
feature.Active = false feature.Active = false
} }
if feature.Usage < feature.UsageLimit { if feature.Usage < feature.UsageLimit || feature.UsageLimit == -1 {
feature.Active = true feature.Active = true
} }
err = fm.UpdateFeatureFlag(feature) err = fm.UpdateFeatureFlag(feature)
@ -313,7 +313,7 @@ func checkFeatureUsage(fm interfaces.FeatureLookup, usage int64) *model.ApiError
return model.BadRequest(err) return model.BadRequest(err)
} }
} }
if feature.UsageLimit-(feature.Usage+usage) < 0 { if feature.UsageLimit-(feature.Usage+usage) < 0 && feature.UsageLimit != -1 {
return model.BadRequest(fmt.Errorf("feature usage exceeded")) return model.BadRequest(fmt.Errorf("feature usage exceeded"))
} }
return nil return nil

4
pkg/query-service/rules/manager.go
View File

@ -411,10 +411,10 @@ func (m *Manager) updateFeatureUsage(parsedRule *PostableRule, usage int64) erro
return err return err
} }
feature.Usage += usage feature.Usage += usage
if feature.Usage == feature.UsageLimit { if feature.Usage == feature.UsageLimit && feature.UsageLimit != -1 {
feature.Active = false feature.Active = false
} }
if feature.Usage < feature.UsageLimit { if feature.Usage < feature.UsageLimit || feature.UsageLimit == -1 {
feature.Active = true feature.Active = true
} }
err = m.featureFlags.UpdateFeatureFlag(feature) err = m.featureFlags.UpdateFeatureFlag(feature)