TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-27 10:10:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

请求统计增加即时、按天

Browse Source
This commit is contained in:
GoEdgeLab
2021-06-08 15:10:08 +08:00
parent 2a4417590b
commit 2a3a8a1e98
3 changed files with 166 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
internal/rpc/services/service_server_daily_stat.go
View File

@@ -67,8 +67,8 @@ func (this *ServerDailyStatService) UploadServerDailyStats(ctx context.Context,
return this.Success()
}
// FindServerHourlyStats 按小时读取统计数据
func (this *ServerDailyStatService) FindServerHourlyStats(ctx context.Context, req *pb.FindServerHourlyStatsRequest) (*pb.FindServerHourlyStatsResponse, error) {
// FindLatestServerHourlyStats 按小时读取统计数据
func (this *ServerDailyStatService) FindLatestServerHourlyStats(ctx context.Context, req *pb.FindLatestServerHourlyStatsRequest) (*pb.FindLatestServerHourlyStatsResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
@@ -76,7 +76,7 @@ func (this *ServerDailyStatService) FindServerHourlyStats(ctx context.Context, r
tx := this.NullTx()
result := []*pb.FindServerHourlyStatsResponse_HourlyStat{}
result := []*pb.FindLatestServerHourlyStatsResponse_HourlyStat{}
if req.Hours > 0 {
for i := int32(0); i < req.Hours; i++ {
hourString := timeutil.Format("YmdH", time.Now().Add(-time.Duration(i)*time.Hour))
@@ -85,7 +85,7 @@ func (this *ServerDailyStatService) FindServerHourlyStats(ctx context.Context, r
return nil, err
}
if stat != nil {
result = append(result, &pb.FindServerHourlyStatsResponse_HourlyStat{
result = append(result, &pb.FindLatestServerHourlyStatsResponse_HourlyStat{
Hour: hourString,
Bytes: stat.Bytes,
CachedBytes: stat.CachedBytes,
@@ -95,5 +95,93 @@ func (this *ServerDailyStatService) FindServerHourlyStats(ctx context.Context, r
}
}
}
return &pb.FindServerHourlyStatsResponse{Stats: result}, nil
return &pb.FindLatestServerHourlyStatsResponse{Stats: result}, nil
}
// FindLatestServerMinutelyStats 按分钟读取统计数据
func (this *ServerDailyStatService) FindLatestServerMinutelyStats(ctx context.Context, req *pb.FindLatestServerMinutelyStatsRequest) (*pb.FindLatestServerMinutelyStatsResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
tx := this.NullTx()
result := []*pb.FindLatestServerMinutelyStatsResponse_MinutelyStat{}
cache := map[string]*pb.FindLatestServerMinutelyStatsResponse_MinutelyStat{} // minute => stat
var avgRatio int64 = 5 * 60 // 因为每5分钟记录一次
if req.Minutes > 0 {
for i := int32(0); i < req.Minutes; i++ {
date := time.Now().Add(-time.Duration(i) * time.Minute)
minuteString := timeutil.Format("YmdHi", date)
minute := date.Minute()
roundMinute := minute - minute%5
if roundMinute != minute {
date = date.Add(-time.Duration(minute-roundMinute) * time.Minute)
}
queryMinuteString := timeutil.Format("YmdHi", date)
pbStat, ok := cache[queryMinuteString]
if ok {
result = append(result, &pb.FindLatestServerMinutelyStatsResponse_MinutelyStat{
Minute: minuteString,
Bytes: pbStat.Bytes,
CachedBytes: pbStat.CachedBytes,
CountRequests: pbStat.CountRequests,
CountCachedRequests: pbStat.CountCachedRequests,
})
continue
}
stat, err := models.SharedServerDailyStatDAO.SumMinutelyStat(tx, req.ServerId, queryMinuteString)
if err != nil {
return nil, err
}
if stat != nil {
pbStat = &pb.FindLatestServerMinutelyStatsResponse_MinutelyStat{
Minute: minuteString,
Bytes: stat.Bytes / avgRatio,
CachedBytes: stat.CachedBytes / avgRatio,
CountRequests: stat.CountRequests / avgRatio,
CountCachedRequests: stat.CountCachedRequests / avgRatio,
}
result = append(result, pbStat)
cache[queryMinuteString] = pbStat
}
}
}
return &pb.FindLatestServerMinutelyStatsResponse{Stats: result}, nil
}
// FindLatestServerDailyStats 按天读取统计数据
func (this *ServerDailyStatService) FindLatestServerDailyStats(ctx context.Context, req *pb.FindLatestServerDailyStatsRequest) (*pb.FindLatestServerDailyStatsResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
tx := this.NullTx()
result := []*pb.FindLatestServerDailyStatsResponse_DailyStat{}
if req.Days > 0 {
for i := int32(0); i < req.Days; i++ {
dayString := timeutil.Format("Ymd", time.Now().AddDate(0, 0, -int(i)))
stat, err := models.SharedServerDailyStatDAO.SumDailyStat(tx, req.ServerId, dayString)
if err != nil {
return nil, err
}
if stat != nil {
result = append(result, &pb.FindLatestServerDailyStatsResponse_DailyStat{
Day: dayString,
Bytes: stat.Bytes,
CachedBytes: stat.CachedBytes,
CountRequests: stat.CountRequests,
CountCachedRequests: stat.CountCachedRequests,
})
}
}
}
return &pb.FindLatestServerDailyStatsResponse{Stats: result}, nil
}