From 7da93633364dd10720068da0a0a1c7c8d623e8fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Tue, 11 Oct 2022 18:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B8=A6=E5=AE=BD=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=97=B6=E9=99=84=E5=B8=A6=E5=8C=BA=E5=9F=9FID?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/stats/bandwidth_stat_manager.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/internal/stats/bandwidth_stat_manager.go b/internal/stats/bandwidth_stat_manager.go index 5e3b848..86666b4 100644 --- a/internal/stats/bandwidth_stat_manager.go +++ b/internal/stats/bandwidth_stat_manager.go @@ -3,9 +3,8 @@ package stats import ( + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" - "github.com/TeaOSLab/EdgeNode/internal/events" - "github.com/TeaOSLab/EdgeNode/internal/goman" "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/TeaOSLab/EdgeNode/internal/rpc" "github.com/iwind/TeaGo/logs" @@ -19,14 +18,6 @@ var SharedBandwidthStatManager = NewBandwidthStatManager() const bandwidthTimestampDelim = 2 // N秒平均，更为精确 -func init() { - events.On(events.EventLoaded, func() { - goman.New(func() { - SharedBandwidthStatManager.Start() - }) - }) -} - type BandwidthStat struct { Day string TimeAt string @@ -65,6 +56,12 @@ func (this *BandwidthStatManager) Start() { } func (this *BandwidthStatManager) Loop() error { + var regionId int64 + nodeConfig, _ := nodeconfigs.SharedNodeConfig() + if nodeConfig != nil { + regionId = nodeConfig.RegionId + } + var now = time.Now() var day = timeutil.Format("Ymd", now) var currentTime = timeutil.FormatTime("Hi", now.Unix()/300*300) @@ -86,6 +83,7 @@ func (this *BandwidthStatManager) Loop() error { Day: stat.Day, TimeAt: stat.TimeAt, Bytes: stat.MaxBytes / bandwidthTimestampDelim, + RegionId: regionId, }) delete(this.m, key) }