TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-05-20 12:42:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix system info timestamp

Browse source
This commit is contained in:
yusing 2025-02-16 04:18:19 +08:00
parent 16b046bd44
commit f2de4692ea
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/metrics/systeminfo/system_info.go
View file

@ -15,7 +15,6 @@ import (
"github.com/yusing/go-proxy/internal/gperr" "github.com/yusing/go-proxy/internal/gperr"
"github.com/yusing/go-proxy/internal/logging" "github.com/yusing/go-proxy/internal/logging"
"github.com/yusing/go-proxy/internal/metrics/period" "github.com/yusing/go-proxy/internal/metrics/period"
"github.com/yusing/go-proxy/internal/utils/strutils"
) )
type SystemInfo struct { type SystemInfo struct {
@ -42,6 +41,7 @@ func _() { // check if this behavior is not changed
func getSystemInfo(ctx context.Context, lastResult *SystemInfo) (*SystemInfo, error) { func getSystemInfo(ctx context.Context, lastResult *SystemInfo) (*SystemInfo, error) {
errs := gperr.NewBuilder("failed to get system info") errs := gperr.NewBuilder("failed to get system info")
var systemInfo SystemInfo var systemInfo SystemInfo
systemInfo.Timestamp = time.Now()
if !common.MetricsDisableCPU { if !common.MetricsDisableCPU {
cpuAverage, err := cpu.PercentWithContext(ctx, 150*time.Millisecond, false) cpuAverage, err := cpu.PercentWithContext(ctx, 150*time.Millisecond, false)
@ -124,7 +124,6 @@ func getSystemInfo(ctx context.Context, lastResult *SystemInfo) (*SystemInfo, er
func (s *SystemInfo) MarshalJSON() ([]byte, error) { func (s *SystemInfo) MarshalJSON() ([]byte, error) {
return json.Marshal(map[string]any{ return json.Marshal(map[string]any{
"timestamp": s.Timestamp.Unix(), "timestamp": s.Timestamp.Unix(),
"time": strutils.FormatTime(s.Timestamp),
"cpu_average": s.CPUAverage, "cpu_average": s.CPUAverage,
"memory": map[string]any{ "memory": map[string]any{
"total": s.Memory.Total, "total": s.Memory.Total,