diff --git a/src/models/target.go b/src/models/target.go index ecfff974..0db00a5f 100644 --- a/src/models/target.go +++ b/src/models/target.go @@ -116,6 +116,10 @@ func buildTargetWhere(bgid int64, clusters []string, query string) *gorm.DB { return session } +func TargetTotalCount() (int64, error) { + return Count(DB().Model(new(Target))) +} + func TargetTotal(bgid int64, clusters []string, query string) (int64, error) { return Count(buildTargetWhere(bgid, clusters, query)) } diff --git a/src/server/usage/usage.go b/src/server/usage/usage.go index 860c82bc..66dfa578 100644 --- a/src/server/usage/usage.go +++ b/src/server/usage/usage.go @@ -59,14 +59,18 @@ func Report() { } func report() { - sps, _ := getSamples() + // sps, _ := getSamples() + tnum, err := models.TargetTotalCount() + if err != nil { + return + } hostname, err := os.Hostname() if err != nil { return } - num, err := models.UserTotal("") + unum, err := models.UserTotal("") if err != nil { return } @@ -74,8 +78,8 @@ func report() { maintainer := "blank" u := Usage{ - Samples: sps, - Users: float64(num), + Samples: float64(tnum), + Users: float64(unum), Hostname: hostname, Maintainer: maintainer, Version: version.VERSION,