From 001bf671e96cf7be1c2ecb12a80e8aba942165e3 Mon Sep 17 00:00:00 2001 From: wangjian Date: Fri, 24 Mar 2023 08:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/monitor/monitor.go | 15 ++++++++------- model/node.go | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/internal/monitor/monitor.go b/internal/monitor/monitor.go index 9bf11f5..9aad7a0 100644 --- a/internal/monitor/monitor.go +++ b/internal/monitor/monitor.go @@ -141,13 +141,14 @@ func GetState(nodeName string) *model.NodeState { NetOutTransfer: netOutTransfer, NetInSpeed: netInSpeed, NetOutSpeed: netOutSpeed, - Uptime: uint64(time.Since(cachedBootTime).Seconds()), - Load1: loadStat.Load1, - Load5: loadStat.Load5, - Load15: loadStat.Load15, - TcpConnCount: tcpConnCount, - UdpConnCount: udpConnCount, - ProcessCount: uint64(len(procs)), + Uptime: time.Now().Unix(), + //Uptime: uint64(time.Since(cachedBootTime).Seconds()), + Load1: loadStat.Load1, + Load5: loadStat.Load5, + Load15: loadStat.Load15, + TcpConnCount: tcpConnCount, + UdpConnCount: udpConnCount, + ProcessCount: uint64(len(procs)), } } diff --git a/model/node.go b/model/node.go index 6321745..2cc31f7 100644 --- a/model/node.go +++ b/model/node.go @@ -38,7 +38,7 @@ type NodeState struct { NetOutTransfer uint64 `json:"netOutTransfer,omitempty"` NetInSpeed uint64 `json:"netInSpeed,omitempty"` NetOutSpeed uint64 `json:"netOutSpeed,omitempty"` - Uptime uint64 `json:"uptime,omitempty"` + Uptime int64 `json:"uptime,omitempty"` Load1 float64 `json:"load1,omitempty"` Load5 float64 `json:"load5,omitempty"` Load15 float64 `json:"load15,omitempty"`