mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-12 19:05:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix cpu usage record

Browse source
This commit is contained in:
0xJacky 2022-02-22 00:23:54 +08:00
parent 897c3cddcd
commit 41b331ab11
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/views/dashboard/DashBoard.vue
View file

@ -127,8 +127,8 @@ export default {
this.websocket.onmessage = this.wsOnMessage this.websocket.onmessage = this.wsOnMessage
this.websocket.onopen = this.wsOpen this.websocket.onopen = this.wsOpen
this.$api.analytic.cpu_usage().then(r => { this.$api.analytic.cpu_usage().then(r => {
this.cpu_analytic.datasets[0].data.concat(r.user) this.cpu_analytic.datasets[0].data = this.cpu_analytic.datasets[0].data.concat(r.user)
this.cpu_analytic.datasets[1].data.concat(r.total) this.cpu_analytic.datasets[1].data = this.cpu_analytic.datasets[1].data.concat(r.total)
}) })
}, },
destroyed() { destroyed() {

2
server/tool/cpu_usage.go
View file

@ -22,7 +22,9 @@ func RecordCpuUsage() {
threadNum := runtime.GOMAXPROCS(0) threadNum := runtime.GOMAXPROCS(0)
cpuUserUsage := (cpuTimesAfter[0].User - cpuTimesBefore[0].User) / (float64(1000*threadNum) / 1000) cpuUserUsage := (cpuTimesAfter[0].User - cpuTimesBefore[0].User) / (float64(1000*threadNum) / 1000)
cpuUserUsage *= 100
cpuSystemUsage := (cpuTimesAfter[0].System - cpuTimesBefore[0].System) / (float64(1000*threadNum) / 1000) cpuSystemUsage := (cpuTimesAfter[0].System - cpuTimesBefore[0].System) / (float64(1000*threadNum) / 1000)
cpuSystemUsage *= 100
now := time.Now() now := time.Now()
u := cpuUsage{ u := cpuUsage{
Time: now, Time: now,